Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit cca7f282 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

renaming ETPT to VTP, refactoring: new cycle format, aux handling (speed... 

renaming ETPT to VTP, refactoring: new cycle format, aux handling (speed dependent), correction of engine fan equation
parent da7c5e19
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 916 additions and 1092 deletions
Documentation/VectoHashingTool/convert.bat
+ 1
− 1
View file @ cca7f282
......@@ -8,7 +8,7 @@ set LIST=
for /f %%f in (files.txt) do set LIST=!LIST! "%%f"
REM pandoc --verbose -f markdown+raw_html %LIST% -s -S --toc --toc-depth=2 --self-contained --email-obfuscation=none --section-divs --mathjax=includes/mathjax.js -c includes/style.css -c includes/print.css -B includes/header.html -A includes/footer.html -o help.html -H includes/jquery.js -H includes/jquery-ui.js -H includes/include.js
REM pandoc --verbose -f markdown+raw_html %LIST% -s --toc --toc-depth=2 --self-contained --email-obfuscation=none --section-divs --mathjax=includes/mathjax.js -c includes/style.css -c includes/print.css -B includes/header.html -A includes/footer.html -o help.html -H includes/jquery.js -H includes/jquery-ui.js -H includes/include.js
%LOCALAPPDATA%\Pandoc\pandoc --verbose -f markdown+raw_html %LIST% -s -S --toc --toc-depth=2 --self-contained --email-obfuscation=none --section-divs --webtex -c includes/style.css -c includes/print.css -B includes/header.html -A includes/footer.html -o HashingToolHelp.html -H includes/jquery.js -H includes/jquery-ui.js -H includes/include.js
REM pandoc %LIST% -s -S --toc --toc-depth=2 --self-contained --email-obfuscation=none --section-divs --webtex -c includes/style.css -B includes/header.html -A includes/footer.html -o help.html -H includes/jquery.js -H includes/jquery-ui.js -H includes/include.js
......
VECTO.sln
+ 18
− 29
View file @ cca7f282

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VECTO", "VECTO\VECTO.vbproj", "{AAC0F132-0A9F-45B3-B682-77AC9B24B352}"
ProjectSection(ProjectDependencies) = postProject
......@@ -144,8 +144,8 @@ Global
{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Deploy|Any CPU.Build.0 = Release|Any CPU
{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Deploy|x64.ActiveCfg = Debug|Any CPU
{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Deploy|x86.ActiveCfg = Debug|Any CPU
{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -172,8 +172,8 @@ Global
{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|Any CPU.Build.0 = Release|Any CPU
{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|x64.ActiveCfg = Debug|Any CPU
{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|x86.ActiveCfg = Debug|Any CPU
{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -199,7 +199,6 @@ Global
{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Deploy|x64.ActiveCfg = Debug|Any CPU
{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Deploy|x86.ActiveCfg = Debug|Any CPU
{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -227,7 +226,6 @@ Global
{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Deploy|x64.ActiveCfg = Debug|Any CPU
{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Deploy|x86.ActiveCfg = Debug|Any CPU
{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -273,8 +271,8 @@ Global
{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|Any CPU.Build.0 = Release|Any CPU
{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|x64.ActiveCfg = Debug|Any CPU
{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|x86.ActiveCfg = Debug|Any CPU
{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -301,8 +299,8 @@ Global
{60AD4DF0-6648-4374-83CB-C7A162EFB391}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
{60AD4DF0-6648-4374-83CB-C7A162EFB391}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{60AD4DF0-6648-4374-83CB-C7A162EFB391}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|Any CPU.Build.0 = Release|Any CPU
{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|x64.ActiveCfg = Debug|Any CPU
{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|x86.ActiveCfg = Debug|Any CPU
{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -330,7 +328,6 @@ Global
{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Deploy|x64.ActiveCfg = Debug|Any CPU
{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Deploy|x86.ActiveCfg = Debug|Any CPU
{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -358,7 +355,6 @@ Global
{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Deploy|x64.ActiveCfg = Debug|Any CPU
{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Deploy|x86.ActiveCfg = Debug|Any CPU
{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -386,7 +382,6 @@ Global
{E8B0B447-1A54-4BEC-A160-AF0017000781}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{E8B0B447-1A54-4BEC-A160-AF0017000781}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{E8B0B447-1A54-4BEC-A160-AF0017000781}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{E8B0B447-1A54-4BEC-A160-AF0017000781}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{E8B0B447-1A54-4BEC-A160-AF0017000781}.Deploy|x64.ActiveCfg = Debug|Any CPU
{E8B0B447-1A54-4BEC-A160-AF0017000781}.Deploy|x86.ActiveCfg = Debug|Any CPU
{E8B0B447-1A54-4BEC-A160-AF0017000781}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -411,8 +406,8 @@ Global
{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|Any CPU.Build.0 = Release|Any CPU
{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|x64.ActiveCfg = Debug|Any CPU
{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|x86.ActiveCfg = Debug|Any CPU
{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -437,7 +432,6 @@ Global
{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Deploy|x64.ActiveCfg = Debug|Any CPU
{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Deploy|x86.ActiveCfg = Debug|Any CPU
{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -485,7 +479,6 @@ Global
{D959CB7C-F514-4F5E-9C33-684D0012474B}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{D959CB7C-F514-4F5E-9C33-684D0012474B}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{D959CB7C-F514-4F5E-9C33-684D0012474B}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{D959CB7C-F514-4F5E-9C33-684D0012474B}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{D959CB7C-F514-4F5E-9C33-684D0012474B}.Deploy|x64.ActiveCfg = Debug|Any CPU
{D959CB7C-F514-4F5E-9C33-684D0012474B}.Deploy|x86.ActiveCfg = Debug|Any CPU
{D959CB7C-F514-4F5E-9C33-684D0012474B}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -509,7 +502,6 @@ Global
{41314A40-AB3E-4F43-B1A4-58443F4014F2}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{41314A40-AB3E-4F43-B1A4-58443F4014F2}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{41314A40-AB3E-4F43-B1A4-58443F4014F2}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{41314A40-AB3E-4F43-B1A4-58443F4014F2}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{41314A40-AB3E-4F43-B1A4-58443F4014F2}.Deploy|x64.ActiveCfg = Debug|Any CPU
{41314A40-AB3E-4F43-B1A4-58443F4014F2}.Deploy|x86.ActiveCfg = Debug|Any CPU
{41314A40-AB3E-4F43-B1A4-58443F4014F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -556,7 +548,6 @@ Global
{2C58BA97-2954-4D19-920F-A24B78FC80A4}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{2C58BA97-2954-4D19-920F-A24B78FC80A4}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{2C58BA97-2954-4D19-920F-A24B78FC80A4}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{2C58BA97-2954-4D19-920F-A24B78FC80A4}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{2C58BA97-2954-4D19-920F-A24B78FC80A4}.Deploy|x64.ActiveCfg = Debug|Any CPU
{2C58BA97-2954-4D19-920F-A24B78FC80A4}.Deploy|x86.ActiveCfg = Debug|Any CPU
{2C58BA97-2954-4D19-920F-A24B78FC80A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -580,7 +571,6 @@ Global
{7C364099-9B85-473A-8A42-BBEBE4798FF5}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{7C364099-9B85-473A-8A42-BBEBE4798FF5}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Deploy|x64.ActiveCfg = Debug|Any CPU
{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Deploy|x86.ActiveCfg = Debug|Any CPU
{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -604,8 +594,8 @@ Global
{B673E12F-D323-4C4C-8805-9915B2C72D3D}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
{B673E12F-D323-4C4C-8805-9915B2C72D3D}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{B673E12F-D323-4C4C-8805-9915B2C72D3D}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|Any CPU.Build.0 = Release|Any CPU
{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|x64.ActiveCfg = Debug|Any CPU
{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|x86.ActiveCfg = Debug|Any CPU
{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -631,7 +621,6 @@ Global
{760C1C5B-A767-463E-BA85-F0BCFC23A550}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{760C1C5B-A767-463E-BA85-F0BCFC23A550}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Deploy|x64.ActiveCfg = Debug|Any CPU
{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Deploy|x86.ActiveCfg = Debug|Any CPU
{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -656,8 +645,8 @@ Global
{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|x64.ActiveCfg = Debug|Any CPU
{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|x86.ActiveCfg = Debug|Any CPU
{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -682,8 +671,8 @@ Global
{33F9848E-9257-4BE2-915F-68E748AEB204}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
{33F9848E-9257-4BE2-915F-68E748AEB204}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{33F9848E-9257-4BE2-915F-68E748AEB204}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|Any CPU.Build.0 = Release|Any CPU
{33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|x64.ActiveCfg = Debug|Any CPU
{33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|x86.ActiveCfg = Debug|Any CPU
{33F9848E-9257-4BE2-915F-68E748AEB204}.Release|Any CPU.ActiveCfg = Release|Any CPU
......
VECTO.sln.DotSettings
+ 1
− 0
View file @ cca7f282
......@@ -35,6 +35,7 @@
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PTO/@EntryIndexedValue">PTO</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RP/@EntryIndexedValue">RP</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SI/@EntryIndexedValue">SI</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VTP/@EntryIndexedValue">VTP</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WHTC/@EntryIndexedValue">WHTC</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XML/@EntryIndexedValue">XML</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XSD/@EntryIndexedValue">XSD</s:String>
......
VECTO/GUI/MainForm.Designer.vb
+ 1
− 1
View file @ cca7f282
......@@ -700,7 +700,7 @@ Partial Class MainForm
Me.EPTPJobEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.EPTPJobEditorToolStripMenuItem.Name = "EPTPJobEditorToolStripMenuItem"
Me.EPTPJobEditorToolStripMenuItem.Size = New System.Drawing.Size(156, 22)
Me.EPTPJobEditorToolStripMenuItem.Text = "EPTP Job Editor"
Me.EPTPJobEditorToolStripMenuItem.Text = "VTP Job Editor"
'
'VEHEditorToolStripMenuItem
'
......
VECTO/GUI/MainForm.vb
+ 10
− 10
View file @ cca7f282
......@@ -1271,18 +1271,18 @@ lbFound:
If x = "<New>" Then
ShowVectoJobForm()
VectoJobForm.VectoNew()
ElseIf x = "<EPTP>" Then
ElseIf x = "<VTP>" Then
ShowVectoEPTPJobForm()
VectoEPTPJobForm.VectoNew()
VectoVTPJobForm.VectoNew()
Else
Try
Dim job As IEPTPInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(x), IEPTPInputDataProvider)
Dim job As IVTPInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(x), IVTPInputDataProvider)
If job Is Nothing Then
ShowVectoJobForm()
VectoJobForm.VECTOload2Form(x)
Else
ShowVectoEPTPJobForm()
VectoEPTPJobForm.VECTOload2Form(x)
VectoVTPJobForm.VECTOload2Form(x)
End If
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.OkOnly, "Error loading Vecto Job File")
......@@ -1302,12 +1302,12 @@ lbFound:
End Sub
Private Sub ShowVectoEPTPJobForm()
If Not VectoEPTPJobForm.Visible Then
VectoEPTPJobForm.Show()
If Not VectoVTPJobForm.Visible Then
VectoVTPJobForm.Show()
Else
If VectoEPTPJobForm.WindowState = FormWindowState.Minimized Then _
VectoEPTPJobForm.WindowState = FormWindowState.Normal
VectoEPTPJobForm.BringToFront()
If VectoVTPJobForm.WindowState = FormWindowState.Minimized Then _
VectoVTPJobForm.WindowState = FormWindowState.Normal
VectoVTPJobForm.BringToFront()
End If
End Sub
......@@ -2030,7 +2030,7 @@ Lb1:
Private Sub EPTPJobEditorToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles EPTPJobEditorToolStripMenuItem.Click
OpenVECTOeditor("<EPTP>")
OpenVECTOeditor("<VTP>")
End Sub
End Class
......
VECTO/GUI/VectoEPTPJobForm.vb → VECTO/GUI/VectoVTPJobForm.vb
+ 9
− 5
View file @ cca7f282
......@@ -34,7 +34,7 @@ Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
''' Job Editor. Create/Edit VECTO job files (.vecto)
''' </summary>
''' <remarks></remarks>
Public Class VectoEPTPJobForm
Public Class VectoVTPJobForm
Public VectoFile As String
Private _changed As Boolean = False
......@@ -167,11 +167,11 @@ Public Class VectoEPTPJobForm
VectoNew()
'Read GEN
Dim vectoJob As IEPTPJobInputData = Nothing
Dim inputData As IEPTPInputDataProvider = Nothing
Dim vectoJob As IVTPJobInputData = Nothing
Dim inputData As IVTPInputDataProvider = Nothing
Try
inputData = TryCast(JSONInputDataFactory.ReadComponentData(file),
IEPTPInputDataProvider)
IVTPInputDataProvider)
vectoJob = inputData.JobInputData()
Catch ex As Exception
MsgBox("Failed to read Job-File" + Environment.NewLine + ex.Message)
......@@ -212,6 +212,7 @@ Public Class VectoEPTPJobForm
If (coefficients.Length >= 3) Then
tbC3.Text = coefficients(2).ToGUIFormat()
End If
tbFanDiameter.Text = (vectoJob.FanDiameter.Value() * 1000).ToGUIFormat()
Try
Dim sb As ICycleData
For Each sb In vectoJob.Cycles
......@@ -266,7 +267,7 @@ Public Class VectoEPTPJobForm
Dim message As String = String.Empty
Dim vectoJob As VectoEPTPJob = New VectoEPTPJob
Dim vectoJob As VectoVTPJob = New VectoVTPJob
vectoJob.FilePath = file
'Files ------------------------------------------------- -----------------
......@@ -284,6 +285,7 @@ Public Class VectoEPTPJobForm
tbC2.Text.ToDouble(0),
tbC3.Text.ToDouble(0)
}
vectoJob.FanDiameter = (tbFanDiameter.Text.ToDouble(0) / 1000).SI(of Meter)
'SAVE
If Not vectoJob.SaveFile Then
......@@ -704,6 +706,8 @@ Public Class VectoEPTPJobForm
Private Sub LvAux_SelectedIndexChanged(sender As Object, e As EventArgs) Handles LvAux.SelectedIndexChanged
End Sub
End Class
VECTO/Input Files/VectoEPTPJob.vb
+ 20
− 10
View file @ cca7f282
......@@ -15,9 +15,9 @@ Imports TUGraz.VectoCore.InputData.Impl
Imports TUGraz.VectoCore.Models.Declaration
Imports TUGraz.VectoCore.Utils
<CustomValidation(GetType(VectoEPTPJob), "ValidateJob")>
Public Class VectoEPTPJob
Implements IEPTPInputDataProvider, IEPTPJobInputData
<CustomValidation(GetType(VectoVTPJob), "ValidateJob")>
Public Class VectoVTPJob
Implements IVTPInputDataProvider, IVTPJobInputData
Private _sFilePath As String
Private _myPath As String
......@@ -26,6 +26,7 @@ Public Class VectoEPTPJob
Public ReadOnly CycleFiles As List(Of SubPath)
Public FanCoefficients As Double()
Private _fanDiameter As Meter
Public Sub New()
......@@ -85,7 +86,7 @@ Public Class VectoEPTPJob
End Function
' ReSharper disable once UnusedMember.Global -- used by Validation
Public Shared Function ValidateJob(vectoJob As VectoEPTPJob, validationContext As ValidationContext) As ValidationResult
Public Shared Function ValidateJob(vectoJob As VectoVTPJob, validationContext As ValidationContext) As ValidationResult
Dim modeService As VectoValidationModeServiceContainer =
TryCast(validationContext.GetService(GetType(VectoValidationModeServiceContainer)),
VectoValidationModeServiceContainer)
......@@ -94,13 +95,13 @@ Public Class VectoEPTPJob
Return ValidateVehicleJob(vectoJob, mode)
End Function
Private Shared Function ValidateVehicleJob(vectoJob As VectoEPTPJob, mode As ExecutionMode) As ValidationResult
Private Shared Function ValidateVehicleJob(vectoJob As VectoVTPJob, mode As ExecutionMode) As ValidationResult
' TODO!!
End Function
Public ReadOnly Property Vehicle As IVehicleDeclarationInputData Implements IEPTPJobInputData.Vehicle
Public ReadOnly Property Vehicle As IVehicleDeclarationInputData Implements IVTPJobInputData.Vehicle
Get
If Not File.Exists(_vehicleFile.FullPath) Then Return Nothing
'Return New JSONComponentInputData(_vehicleFile.FullPath).JobInputData.Vehicle
......@@ -108,7 +109,7 @@ Public Class VectoEPTPJob
End Get
End Property
Public ReadOnly Property Cycles As IList(Of ICycleData) Implements IEPTPJobInputData.Cycles
Public ReadOnly Property Cycles As IList(Of ICycleData) Implements IVTPJobInputData.Cycles
Get
Dim retVal As ICycleData() = New ICycleData(CycleFiles.Count - 1) {}
Dim i As Integer = 0
......@@ -137,19 +138,28 @@ Public Class VectoEPTPJob
End Get
End Property
Public ReadOnly Property FanPowerCoefficents As IEnumerable(Of Double) Implements IEPTPJobInputData.FanPowerCoefficents
Public ReadOnly Property FanPowerCoefficents As IEnumerable(Of Double) Implements IVTPJobInputData.FanPowerCoefficents
Get
Return FanCoefficients
End Get
End Property
Public ReadOnly Property SavedInDeclarationMode As Boolean Implements IEPTPJobInputData.SavedInDeclarationMode
Public ReadOnly Property SavedInDeclarationMode As Boolean Implements IVTPJobInputData.SavedInDeclarationMode
Get
Return False
End Get
End Property
Public ReadOnly Property JobInputData As IEPTPJobInputData Implements IEPTPInputDataProvider.JobInputData
Public Property FanDiameter As Meter Implements IVTPJobInputData.FanDiameter
Get
Return _fanDiameter
End Get
Set
_fanDiameter = value
End Set
End Property
Public ReadOnly Property JobInputData As IVTPJobInputData Implements IVTPInputDataProvider.JobInputData
Get
Return Me
End Get
......
VECTO/OutputData/JSONFileWriter.vb
+ 3
− 2
View file @ cca7f282
......@@ -352,17 +352,18 @@ Public Class JSONFileWriter
WriteFile(header, body, filename)
End Sub
Public Sub SaveJob(input As IEPTPInputDataProvider, filename As String) Implements IOutputFileWriter.SaveJob
Public Sub SaveJob(input As IVTPInputDataProvider, filename As String) Implements IOutputFileWriter.SaveJob
Dim basePath As String = Path.GetDirectoryName(filename)
'Header
Dim header As Dictionary(Of String, Object) = GetHeader(VectoJobFormatVersion)
'Body
Dim body As Dictionary(Of String, Object) = New Dictionary(Of String, Object)
Dim job As IEPTPJobInputData = input.JobInputData
Dim job As IVTPJobInputData = input.JobInputData
body.Add("SavedInDeclMode", False)
body.Add("DeclarationVehicle", GetRelativePath(job.Vehicle.Source, Path.GetDirectoryName(filename)))
body.Add("FanPowerCoefficients", job.FanPowerCoefficents)
body.Add("FanDiameter", job.FanDiameter.Value())
body.Add("Cycles",
job.Cycles.Select(Function(x) GetRelativePath(x.CycleData.Source, Path.GetDirectoryName(filename))).ToArray())
......
VECTO/Resources/P_fan_eqn.png
+ 0
− 0
View replaced file @ da7c5e19 View file @ cca7f282
VECTO/Resources/P_fan_eqn.png

8.39 KiB | W: | H:

VECTO/Resources/P_fan_eqn.png

9.29 KiB | W: | H:

VECTO/Resources/P_fan_eqn.png
VECTO/Resources/P_fan_eqn.png
VECTO/Resources/P_fan_eqn.png
VECTO/Resources/P_fan_eqn.png
  • 2-up
  • Swipe
  • Onion skin
VECTO/VECTO.vbproj
+ 5
− 7
View file @ cca7f282
......@@ -187,10 +187,10 @@
</ItemGroup>
<ItemGroup>
<Compile Include="ApplicationEvents.vb" />
<Compile Include="GUI\VectoEPTPJobForm.Designer.vb">
<DependentUpon>VectoEPTPJobForm.vb</DependentUpon>
<Compile Include="GUI\VectoVTPJobForm.Designer.vb">
<DependentUpon>VectoVTPJobForm.vb</DependentUpon>
</Compile>
<Compile Include="GUI\VectoEPTPJobForm.vb">
<Compile Include="GUI\VectoVTPJobForm.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Input Files\BrowserUtils.vb" />
......@@ -358,8 +358,8 @@
<EmbeddedResource Include="GUI\JiraDialog.resx">
<DependentUpon>JiraDialog.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GUI\VectoEPTPJobForm.resx">
<DependentUpon>VectoEPTPJobForm.vb</DependentUpon>
<EmbeddedResource Include="GUI\VectoVTPJobForm.resx">
<DependentUpon>VectoVTPJobForm.vb</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="GUI\VehicleTorqueLimitsDialog.resx">
......@@ -540,8 +540,6 @@
<Content Include="Resources\F_VECTO.ico" />
<Content Include="Resources\F_VEH.ico" />
<Content Include="Resources\Graph.ico" />
<None Include="Resources\P_fan_Equation.bmp" />
<None Include="Resources\P_fan_units.png" />
<None Include="Resources\P_fan_eqn.png" />
<Content Include="Resources\Status-dialog-password-icon.ico" />
<EmbeddedResource Include="Resources\Undef.png" />
......
VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
+ 1
− 1
View file @ cca7f282
......@@ -283,7 +283,7 @@ namespace TUGraz.VectoCommon.InputData
{
//new IStartStopEngineeringInputData StartStop { get; }
new IOverSpeedEcoRollEngineeringInputData OverSpeedEcoRoll { get; }
IOverSpeedEcoRollEngineeringInputData OverSpeedEcoRoll { get; }
/// <summary>
/// P009; P033, P034, P035
......
VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
+ 6
− 4
View file @ cca7f282
......@@ -31,6 +31,7 @@
using System.Collections.Generic;
using System.Xml.Linq;
using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCommon.InputData
{
......@@ -50,12 +51,12 @@ namespace TUGraz.VectoCommon.InputData
IDriverEngineeringInputData DriverInputData { get; }
}
public interface IEPTPInputDataProvider : IInputDataProvider
public interface IVTPInputDataProvider : IInputDataProvider
{
IEPTPJobInputData JobInputData { get; }
IVTPJobInputData JobInputData { get; }
}
public interface IEPTPJobInputData
public interface IVTPJobInputData
{
IVehicleDeclarationInputData Vehicle { get; }
......@@ -63,5 +64,6 @@ namespace TUGraz.VectoCommon.InputData
IEnumerable<double> FanPowerCoefficents { get; }
bool SavedInDeclarationMode { get; }
}
Meter FanDiameter { get; }
}
}
VectoCommon/VectoCommon/OutputData/IOutputFileWriter.cs
+ 1
− 1
View file @ cca7f282
......@@ -45,7 +45,7 @@ namespace TUGraz.VectoCommon.OutputData
void SaveJob(IEngineeringInputDataProvider input, string filename);
void SaveJob(IEPTPInputDataProvider input, string filename);
void SaveJob(IVTPInputDataProvider input, string filename);
void ExportJob(IEngineeringInputDataProvider input, string filename, bool separateFiles);
}
......
VectoCommon/VectoHashing/IVectoHash.cs
+ 1
− 1
View file @ cca7f282
......@@ -106,7 +106,7 @@ namespace TUGraz.VectoHashing
/// <summary>
// Computes the hash-value of the top-level Data element (or vehicle)
/// Computes the hash-value of the top-level Data element (or vehicle)
/// If the canoonicalizationMethods is null the canonicalizationMethods from
/// the signature element are read if available or the default canonicalization is applied
/// If the digestMethod is null the digestMethod from the signature element is read if
......
VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+ 624
− 621
View file @ cca7f282
This diff is collapsed.
VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
+ 1
− 1
View file @ cca7f282
......@@ -72,7 +72,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
return new JSONInputDataV3(json, filename, tolerateMissing);
case 4:
if (json["Body"]["DeclarationVehicle"] != null) {
return new JSONEPTPInputDataV4(json, filename, tolerateMissing);
return new JSONVTPInputDataV4(json, filename, tolerateMissing);
}
return new JSONInputDataV4(json, filename, tolerateMissing);
default:
......
VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs
+ 42
− 22
View file @ cca7f282
......@@ -74,8 +74,8 @@ namespace TUGraz.VectoCore.InputData.Reader
if (DistanceBasedCycleDataParser.ValidateHeader(cols, false)) {
return CycleType.DistanceBased;
}
if (EPTPCycleDataParser.ValidateHeader(cols, false)) {
return CycleType.EPTP;
if (VTPCycleDataParser.ValidateHeader(cols, false)) {
return CycleType.VTP;
}
throw new VectoException("CycleFile format is unknown.");
}
......@@ -95,8 +95,8 @@ namespace TUGraz.VectoCore.InputData.Reader
return new MeasuredSpeedDataParser();
case CycleType.PTO:
return new PTOCycleDataParser();
case CycleType.EPTP:
return new EPTPCycleDataParser();
case CycleType.VTP:
return new VTPCycleDataParser();
default:
throw new ArgumentOutOfRangeException("Cycle Type", type.ToString());
......@@ -319,6 +319,11 @@ namespace TUGraz.VectoCore.InputData.Reader
public const string EngineSpeed = "n";
public const string EngineSpeedSuffix = "n_eng";
public const string FanSpeed = "n_fan";
public const string WheelTorqueLeft = "tq_left";
public const string WheelTorqueRight = "tq_right";
public const string WheelSpeedLeft = "n_wh_left";
public const string WheelSpeedRight = "n_wh_right";
public const string FuelConsumption = "fc";
public const string Gear = "gear";
public const string AdditionalAuxPowerDemand = "Padd";
public const string AirSpeedRelativeToVehicle = "vair_res";
......@@ -711,20 +716,28 @@ namespace TUGraz.VectoCore.InputData.Reader
/// Parser for PTO Cycles.
/// </summary>
// <t>,<v> [km/h],<Pwheel> [kW],<n_eng> [rpm],<n_fan> [rpm], <Padd> [kW]
private class EPTPCycleDataParser : AbstractCycleDataParser
private class VTPCycleDataParser : AbstractCycleDataParser
{
public override IEnumerable<DrivingCycleData.DrivingCycleEntry> Parse(DataTable table, bool crossWindRequired)
{
ValidateHeader(table.Columns);
var entries = table.Rows.Cast<DataRow>().Select(row => new DrivingCycleData.DrivingCycleEntry {
Time = row.ParseDouble(Fields.Time).SI<Second>(),
VehicleTargetSpeed = row.ParseDouble(Fields.VehicleSpeed).KMPHtoMeterPerSecond(),
AdditionalAuxPowerDemand = row.ParseDoubleOrGetDefault(Fields.AdditionalAuxPowerDemand).SI().Kilo.Watt.Cast<Watt>(),
PWheel = row.ParseDouble(Fields.PWheel).SI().Kilo.Watt.Cast<Watt>(),
EngineSpeed = row.ParseDouble(Fields.EngineSpeedSuffix).RPMtoRad(),
FanSpeed = row.ParseDouble(Fields.FanSpeed).RPMtoRad()
}).ToArray();
var entries = table.Rows.Cast<DataRow>().Select(row => {
var wheelSpeed =
((row.ParseDouble(Fields.WheelSpeedLeft) + row.ParseDouble(Fields.WheelSpeedRight)) / 2).RPMtoRad();
return new DrivingCycleData.DrivingCycleEntry {
Time = row.ParseDouble(Fields.Time).SI<Second>(),
VehicleTargetSpeed = row.ParseDouble(Fields.VehicleSpeed).KMPHtoMeterPerSecond(),
AdditionalAuxPowerDemand =
row.ParseDoubleOrGetDefault(Fields.AdditionalAuxPowerDemand).SI().Kilo.Watt.Cast<Watt>(),
EngineSpeed = row.ParseDouble(Fields.EngineSpeedSuffix).RPMtoRad(),
WheelAngularVelocity = wheelSpeed,
Torque = (row.ParseDouble(Fields.WheelTorqueLeft).SI<NewtonMeter>() * row.ParseDouble(Fields.WheelSpeedLeft).RPMtoRad() + row.ParseDouble(Fields.WheelTorqueRight).SI<NewtonMeter>() * row.ParseDouble(Fields.WheelSpeedRight).RPMtoRad()) / wheelSpeed,
FanSpeed = row.ParseDouble(Fields.FanSpeed).RPMtoRad(),
Gear = (uint)row.ParseDoubleOrGetDefault(Fields.Gear),
Fuelconsumption = row.ParseDoubleOrGetDefault(Fields.FuelConsumption).SI().Gramm.Per.Hour.ConvertTo().Kilo.Gramm.Per.Second.Cast<KilogramPerSecond>(),
};
}).ToArray();
return entries;
}
......@@ -734,19 +747,26 @@ namespace TUGraz.VectoCore.InputData.Reader
var requiredCols = new[] {
Fields.Time,
Fields.VehicleSpeed,
Fields.PWheel,
Fields.EngineSpeedSuffix,
Fields.FanSpeed
Fields.FanSpeed,
Fields.WheelSpeedLeft,
Fields.WheelSpeedRight,
Fields.WheelTorqueLeft,
Fields.WheelTorqueRight,
};
var allowedCols = new[] {
Fields.Time,
Fields.VehicleSpeed,
Fields.AdditionalAuxPowerDemand,
Fields.PWheel,
Fields.EngineSpeedSuffix,
Fields.FanSpeed
};
Fields.Time,
Fields.VehicleSpeed,
Fields.EngineSpeedSuffix,
Fields.FanSpeed,
Fields.WheelSpeedLeft,
Fields.WheelSpeedRight,
Fields.WheelTorqueLeft,
Fields.WheelTorqueRight,
Fields.Gear,
Fields.FuelConsumption
};
const bool allowAux = true;
......
VectoCore/VectoCore/InputData/Reader/Impl/EngineeringEPTPModeVectoRunDataFactory.cs → VectoCore/VectoCore/InputData/Reader/Impl/EngineeringVTPModeVectoRunDataFactory.cs
+ 27
− 7
View file @ cca7f282
......@@ -11,13 +11,13 @@ using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
namespace TUGraz.VectoCore.InputData.Reader.Impl {
internal class EngineeringEPTPModeVectoRunDataFactory : IVectoRunDataFactory
internal class EngineeringVTPModeVectoRunDataFactory : IVectoRunDataFactory
{
protected IEPTPInputDataProvider InputDataProvider;
protected IVTPInputDataProvider InputDataProvider;
public EngineeringEPTPModeVectoRunDataFactory(IEPTPInputDataProvider eptpProvider)
public EngineeringVTPModeVectoRunDataFactory(IVTPInputDataProvider ivtpProvider)
{
InputDataProvider = eptpProvider;
InputDataProvider = ivtpProvider;
}
public IEnumerable<VectoRunData> NextRun()
......@@ -46,8 +46,25 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl {
var ptoTransmissionData = dao.CreatePTOTransmissionData(InputDataProvider.JobInputData.Vehicle.PTOTransmissionInputData);
var aux = dao.CreateAuxiliaryData(InputDataProvider.JobInputData.Vehicle.AuxiliaryInputData(), MissionType.RegionalDelivery, segment.VehicleClass).ToList();
aux.RemoveAll(x => x.ID == Constants.Auxiliaries.IDs.Fan);
var auxRD = dao.CreateAuxiliaryData(InputDataProvider.JobInputData.Vehicle.AuxiliaryInputData(), MissionType.RegionalDelivery, segment.VehicleClass).ToList();
foreach (var entry in auxRD) {
entry.MissionType = MissionType.RegionalDelivery;
}
var auxLH = dao.CreateAuxiliaryData(InputDataProvider.JobInputData.Vehicle.AuxiliaryInputData(), MissionType.LongHaul, segment.VehicleClass).ToList();
foreach (var entry in auxLH) {
entry.MissionType = MissionType.LongHaul;
}
var auxUD = dao.CreateAuxiliaryData(InputDataProvider.JobInputData.Vehicle.AuxiliaryInputData(), MissionType.UrbanDelivery, segment.VehicleClass).ToList();
foreach (var entry in auxUD) {
entry.MissionType = MissionType.UrbanDelivery;
}
var aux = new List<VectoRunData.AuxData>();
aux.AddRange(auxRD);
aux.AddRange(auxLH);
aux.AddRange(auxUD);
aux.RemoveAll(x => x.ID == Constants.Auxiliaries.IDs.Fan);
aux.Add(new VectoRunData.AuxData {
DemandType = AuxiliaryDemandType.Direct,
ID = DrivingCycleDataReader.Fields.AdditionalAuxPowerDemand
......@@ -71,7 +88,10 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl {
PTO = ptoTransmissionData,
Cycle = new DrivingCycleProxy(drivingCycle, cycle.Name),
ExecutionMode = ExecutionMode.Engineering,
AuxFanParameters = InputDataProvider.JobInputData.FanPowerCoefficents.ToArray()
FanData = new AuxFanData() {
FanCoefficients = InputDataProvider.JobInputData.FanPowerCoefficents.ToArray(),
FanDiameter = InputDataProvider.JobInputData.FanDiameter,
}
};
});
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about