diff --git a/Build/Packaging.targets b/Build/Packaging.targets
index 8c58ace1b4513eea95338b41735d0b409b24a22d..2d57de687171b089a23d2c62c046e1f6256b4742 100644
--- a/Build/Packaging.targets
+++ b/Build/Packaging.targets
@@ -56,7 +56,7 @@
<Target Name="AfterBuild" Condition="$(Configuration) == 'Deploy'">
<ItemGroup>
<VectoCoreAssembly Include="$(OutputPath)VectoCore.dll" />
- <VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Deploy\vectocmd.exe*"/>
+ <VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\vectocmd.exe*"/>
<GenericVehicles Include="$(SolutionDir)Generic Vehicles\**\*.*" Exclude="$(SolutionDir)**\*.vmod;$(SolutionDir)**\*.vsum;$(SolutionDir)**\*RSLT_*.xml;$(SolutionDir)**\*.pdf"/>
<MissionProfiles Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\MissionCycles\**\*.*"/>
@@ -72,7 +72,7 @@
<UserManual Include="$(SolutionDir)Documentation\Cdv_Generator_VECTO3.2.xlsx"/>
<ReleaseNotes Include="$(SolutionDir)Documentation\User Manual Source\Release Notes Vecto3.x.pdf"/>
- <HashingTool Include="$(SolutionDir)HashingTool\bin\Deploy\HashingTool.exe"/>
+ <HashingTool Include="$(SolutionDir)HashingTool\bin\Release\HashingTool.exe"/>
<HashingTool Include="$(SolutionDir)VectoCommon\VectoHashing\bin\Release\VectoHashing.XML"/>
<HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\hashingcmd.exe"/>
</ItemGroup>
diff --git a/Documentation/Checklist_Release_VECTO_3.3.0.1250.docx b/Documentation/Checklist_Release_VECTO_3.3.0.1250.docx
new file mode 100644
index 0000000000000000000000000000000000000000..a51a816b062a576487f34f3d7cbb51d69778f876
Binary files /dev/null and b/Documentation/Checklist_Release_VECTO_3.3.0.1250.docx differ
diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf
index f5c86ddbcef258fdd7ea2435a699e1661c8010e2..c8e2dafb6654057a2b4646da117aefa84bd3ce33 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 737f4eb1964cece32025967014dce2fd38489e89..2f96aca28965e7fc7c3eda73b7a463444d0cf677 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/1-user-interface/0_start.md b/Documentation/User Manual/1-user-interface/0_start.md
index b6f350d9eeb520c78f8545579b2cb621ff28ae3b..8962a35db8bc27aa1637bde6a067dbfb434dd1c3 100644
--- a/Documentation/User Manual/1-user-interface/0_start.md
+++ b/Documentation/User Manual/1-user-interface/0_start.md
@@ -16,7 +16,7 @@ User Manual
====================================
\
\
-Version: VECTO 3.2 / VectoCore 3.2.0 / VectoCmd 3.2.0
+Version: VECTO 3.3 / VectoCore 3.3.0 / VectoCmd 3.3.0
---
@@ -34,6 +34,6 @@ This User Manual consists of 4 Parts:
- [Input and Output](#input-and-output):
: Describes the input and output file formats.
-This user manual describes verson 3.2.x of Vecto.
+This user manual describes verson 3.3.x of Vecto.
diff --git a/Documentation/User Manual/6-changelog/changelog.md b/Documentation/User Manual/6-changelog/changelog.md
index 2d6299afe6cfb9c0b915fd324af01523623f76cf..b05b37e62abb5592f5f4a9a46a0e8b0e120acb52 100644
--- a/Documentation/User Manual/6-changelog/changelog.md
+++ b/Documentation/User Manual/6-changelog/changelog.md
@@ -1,5 +1,33 @@
#Changelog
+**VECTO 3.3.0**
+
+***Build 1250 (2018-06-04)***
+
+
+- Improvement
+ * [VECTO-665] - Adding style information to XML Reports
+ * [VECTO-669] - Group 1 vehicle comprises vehicles with gross vehicle weight > 7.5t
+ * [VECTO-672] - Keep manual choice for "Validate data"
+ * [VECTO-682] - VTP Simulation in declaration mode
+ * [VECTO-652] - VTP: Check Cycle matches simulation mode
+ * [VECTO-683] - VTP: Quality and plausibility checks for recorded data from VTP
+ * [VECTO-685] - VTP Programming of standard VECTO VTP report
+ * [VECTO-689] - Additional Tyre sizes
+ * [VECTO-702] - Hashing tool: adapt warnings
+ * [VECTO-667] - Removing NCV Correction Factor
+ * [VECTO-679] - Engine n95h computation gives wrong (too high) engine speed (above measured FLD, n70h)
+ * [VECTO-693] - extend vehicle performance in manufacturer record
+
+- Bugfixes
+ * [VECTO-656] - Distance computation in vsum
+ * [VECTO-666] - CF_RegPer no effect in vehicle simulation -- added to the engine correction factors
+ * [VECTO-687] - Saving a Engine-Only Job is not possible
+ * [VECTO-695] - Bug in vectocmd.exe - process does not terminate
+ * [VECTO-699] - Output in manufacturer report and customer report (VECTO) uses different units than described in legislation
+ * [VECTO-700] - errorr in simulation with 0 stop time at the beginning of the cycle
+
+
**VECTO 3.2.1**
***Build 1133 (2018-02-07)***
diff --git a/Documentation/User Manual/help.html b/Documentation/User Manual/help.html
index c0fa809829d6c69b961b1d55bd26db668859181d..30d7f5e60d43310fdd7e1c72ef96ef3911501d76 100644
--- a/Documentation/User Manual/help.html
+++ b/Documentation/User Manual/help.html
@@ -246,7 +246,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
<h1>User Manual</h1>
<p><img src="data:image/png;base64,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hg4duvbgtdOZTDqdJhAISd1DDzR8TZtJ3cd8Pp/L5WTefuedd958882FCxfOmjXLVEeYefjw4QMGDBg1atRWW21tpa10Om1ZVoAgu5FyVuvCacksSP0trMkbrtp7NSZpseCurikxk31joHgC5+X8G2ZVfdqunMpmsx988MHll17297//PZNKWZalZUxV1TeTyvv27fvWe+92OxFi23Y2m33qyb/NmDHjzTfesCzLEsKyLFtKbReGvSuO5JbSltK27W22227KoVN+/JOfNDY2Vp6mkYwi51Wf08tms/PnfX/XXXdd95e/tLW1WZZluhPMa6ISeaSU+p+klLZtrz148Aknn7TPPvuYQqVr13vLjBmHH3H4juPGPf/c8/UkSJQxAoAFYN/1yt9OuPX3jgEHi7qURmOzl5lZAKBRG2zx2GnXktOlO2aWrS+VlPKzTz494IADvv/uu1QqFfDah4m4qrvX3LfvO/UqSMK7IaVsaWk547TTH3344VQqFVAjlCaobntAK9Q6h/RLGmJIcC6XG7/33hf/6U+9m3qT31isEz546JQpSxYv6V5SZPmKFc88+0zXeq78YUvnWre3t7/91lsnnXjS/z7/PG2llOM+TGzF76D5CillWzY7afLkc357Tr9+/SId1DWjpXoVJCFV2pq80Wq9VgFJCaurrlicUgRgsCVFi2xZesO7zBIxFV0Gou7q55mvvDphwoTmpqbaCIwORx0KksCOqf3JZrN333nX2Wef3ZjJVGnfmLk1m50+ffrBh0xWBUB1ckYARm69zYIFC7qXIFm8ePGCJYu7VoqYtATmZcuWTznkkH/PmmVZVjXoB0B7Pj9jxoydd93FZFC1jJ2ULki6zAZXwFONqUYpwLBAXeYAJXfERAIkhb3bsDEsJRBb7CcQvlu2dOnQTTY9eNKkPs3NmqoS13xxG46IstnssUcfs/GQjf74hz8oKVI9ourV0HDeueduuO56086fms/lTBaQ5K12l2FKEU1LH3zwwVZbbLnFZpu9+/bbypat0tsb0ulfHnHEmmv84InHHg9E4Otto7rOmUtg5uuPPB+SGLkukSPVsBCJwEyWlSHBgB3jVPU8n3j08U032bS9rS0sZpIR4AJaUbBz9pmnn7HRhkOeevLJlBHzqJ4AVk9Op9M3Xn/9RhtseMtNNydn1B11EfP2LVy4cIvNtxj/458s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7r24+fDNPvn4E69BMpeaB6R++PJ/X2668SaLFi6Md8mtra37TpxY7Y3tpsF2dUhkWXTZ5HPY78xxHVncySaGJImJWXBqjxHjbGaSANtld2OM0T1Vnr9F+XCFEOf94Q9Tzz+/Npyourozs7CsY445pkJPmvl1pfu3rlgxYvjwP577xyJLiP49QTJvP2bszTfcEFfqms4qHDhwYFxlBMkwj3/tdQavNWiQCUtToXBS5GTncnvsuuvvzvktAt5X7vi7p51y6k477JBvb0cciRUmJM9GG200ZKMh1TZqu6fVzJBgAZLge1998sRbz82DU0gR5SFdpHenlVUneoEJEgy5vL192U1vKfeZ5/Xqirv8wx3GffHFF2V3mQ0EEqSU/fr2tTIZVUoSo40iVOdq5ua+ff/xzNPVPHaAub0tu+nGG1eIKq83R2PUA7Dz+b6rrnr8Cccf8YtfFFIbAzJs8qSDZ776qu1it/gyOCtuw/Xsc8+tt8H6sXQarnzMmT3nx3vsUXmt/gZDhjz97DNdyTykBNFlf770yssuI5eKKtxb8yFSyubm5l8dffRxx//aIwYDsinwxquvvOov11zTsmJFNQKNUsqLLrlkv4n7Vduo7ZaCRHeecnyI+w9eo/8gJrK4ApbPLAVZTKM22uKhU67lOihB3HWnH3722WeKzcWCkBOEmDWFZcWPJUaffn3feu/dGhz/6FGj5s+bFxdqkG9bpLSlbGxsHDho0KSDD54wYfzANdcMfP6F556/5957Zs18fd5335EQ1SjyYOa2trYvv/majJqnrh0rjyBxj3vEsM1WrFheDQmt8AgaGhpWW331SZMmHXDQgQMGDDA/8P138+677757773366++yudy1aAfpytBPv/FV1/GIixXTkGi8FEEwOAHZv79+Bl/kMSSYUmBToL+msefzbX/75qXemeaiLpelPz62OOefPxxpeOUrU2EqSden7v5/D79+r397js1cPctWLBg1DbbxrKEyP0RQkCyzU5mcCaT0Qy0paVFNRQp/pAKpySEOP7EE399wvH149daOQSJaSyeftrp9919dywN08LeKvONUkpVtOsUMGXbpbQVCZn8PS6Oo1VPAOeed94hh06pQfp49wy2MxiSAAkmxn6jf7xgxRIGlRgUMR2IwhgM2W63NzU0kYuL0rVjxIgRMGpTYyFrGE2WYr+iovpcQM18wIABTU1N8aYzmZl+qnuDilUIIfL5fHt7ezabzWazqVRKSxH9dsWMKi9G0xPIZrPHHndskq8VP+swEC4uuviiJrfKKl5C8ilqRGRZzJzL5bLZbC6XE4IUMrzpXEV8eqt+YN62ayNFuqsgYYIg4ZSpCwHwJZN/QzbB6UXVsbj2hIdBQIJotxE7sFQtYLr+Am+97TaVK7wmpbJ/xEi1TrCx2gE9A3fr+ZdeiqUK0px/eKP0vwbQ9Mx/hZvvH8tdVQ854aSTrFQqwdeqqjoC4NTTTrUr6E1QRB1RhggzE7MwIGJ1ZzOTdOOXZEQs5aWXXabkUw2oqJum//odXYwjdzlgaduyMnCxyIior8i1PHzytUwOznCXL/MHP/iBKsFFBdlQAXoNNMaIUcurpV+Cmfuv1n/0qFGxQLMEuoMEjDYqPBBHpn/ATGTmtmz2pJNPrvDck9HxlQcO+7//W2vw4GrcBY9IoprNhN8Y7xwgeYMhQ/ZVMfaa3E3R7cmCiYFMKtPauphQ0JLoUA1n8C6bbq+2ncD1UIQ4cODAFS0t6Op0nXpjAVqczLjjjpbW1pVJU1ZLu+yyy6yUlYiQ2uglf3vqqaxRSLhyjOXLl11/4w21JKFuL0jgqqT3n3Kj6i8RFh4Bd5amIWWCKtGTzbfffMyFDAlJXB+o8alUatyOOyKpRItS+piRzqTvuffeQGCzuy8tL+XEA/ZPVIeayZK+/foefsQRusS1W5OQ9qqd/bvfbrDhhlRDNiZWAloACQLtO+pHC5cvheHLLhQL8W4pK/RggOUOQ0ev0rsfsYAAEaE+6Omc3/22el38uimrdS0SMPO4nXYcOmwY3CrUynOKupwRzHz9dRjYZYk4qbaBC+Dc8/643vrrd6oivW4VLAAbb7LJCSeeyCrBv1Zr6faChImIwcQALpx0eiFbQhONGfICIIUliUAiTU7+nXaW1wNbGTp06PLly5M7H3mUajz2xBNLly41xW23zGhnJtCkgw8euObABOu3dnvuOkufe/GFhobGahdbVHUtimyy7e2PPPZY7a/AShAjcVruMuOoXQ9a2rq8uH1qShEisgABubx1yQMnX1OHoFpNTU2H/d//JY6OIkdJgubMnauzErqpFk9EqUz6/OnTkrPuEv5LRM+9+HxbW1s3tUgUzSxbtuzvT/8j05CJVLkSQVJ8C536RLBszDS2tC0XJIQgQULTSnjTVYkAMxPAoH1G78XVaTleCYmrv088+eRsNht72u7KwQXUD6sNWO3hRx/VmbhlY5R1FRcD0NbS+u+3307OtMbM18y+XX2NNWbcfnt7NktRNFbPV0D93dLaeuPNNw/fbDMvkzAm6IqeIUgYqqJEweY8cOp1INWfKhfO6TZrhVx/KLXns38++CzlJKtDKh+01qADJ00SLhRHoq4Gtkhxga233eaiP/3JhGJENcHz45q/it7l8/mXX3+tV+9eiTnSZXYtEYBdd9v1siuvzOZy3QVxWcuMXC43bfr08XtPMP2itSSmlSNry9vWn4/c85v5XzMRI23upNnBQpGO0xqP5Lih2w3osyrIqreVOeEc8PQLLmhtaUmi7sV5wX77T9SypFswAq3Z3PPA/euvv37Svapr2bHa/H0n7nf5FVcoT2m3MEcA5PP5k0899f+OCDYdqSXpi5WJIBhg5sfPngFm4SDSMkJQBEqEKB3fQkqINLNNLrBSfUkRZjDSmfTjTz2Vrbg4caXnBfvtP/HCiy8ur0tdlwzJfMFFF40eNTpcXZ+M2l83LUsuveLybDaL+jZHnA4IbW3n/O53J558Utd6dFcqQaI6H+4ybNSytmVMKFSBTIJc+GAsbln84IlXAULW21r8avVWW2919llnmeSexEsiFfyJB+x/66232vl8vUW8IseFF164/4EHgHwYUIl3qwuvm2PdTpz4wEMPtbvdQerTkJVStrS0XPfXv/7yV0cGNOZEkFSu46FXQ68/7HcSsRdmMNU9rb8yIAR+stWukqW6yPVJ33oJxx7/618ffwL8AFOJLAnsFTNv/8OdnnrmmZYVK+rn5sOI6ChTOJfL3XHP3fsfdGDgM8k5dvldU3+PGjP6X6++Kg2+XA93zeRjy1es+OcLz4/fe4IpC7uKhFY6QUJg5vVXX5uEZeb2ma2BCFK10W3Jtt1zwuUEkl3WBbFjd41JQyedevKxxx8vbZv8AD7J8G0a89BhQz+Y+1EqkzFRF7uKEZjkp/5etHjxiy+/PHbsWLhpZoUOPRldqPWvs+46/5n9weo/+IFzQPVQW+bOYbUBAz7673+HDR9uWrFdSDwrlyBhAFJVuX+94IuwrupsN6CamYzb5P/be/a4nq/+z/l0Fbllk7AUKxPZVxLxoG0ZipZ7JiOlYuY6Nhu57JnLsNgTm260PM/DWBu5howSTR63kqJSyCii+/fyOb8/3pwdn8/3+61Z/Crn/cf3db6fz/mc6/u87+ec3n+u3nof4QOJeQvmb4uJefTsFjwOcjNFq1atrmVnTZ4yRaVW14eAN4qEdvb2hff+sOlsW09IAAetGiSAmZnZmdSzs+fOraysrA8zZIBxVVVVwPTAs7+ntmjZov4YQhsXI8GIIIFgDRHJgcU7mGNanzmrWYMMMBaVSuWWaV89UUWIiIhY/0P9oP2D3nHLvHatS5cu7BWB9PQw+dlTr7JDJWT5siMJCdXV1aykybolX9DISDyfcHR4eXn5xu++O3jksLGxMctCuIO9Hq41VvKYPXfOb6dOmZqaakGduovskJ/O8OQaU4RopYZGRsdOJH72xedIsvD/v/GnsZm2MMKIYITRP+x7lVaVw21XBInUPI0wNkQiIgZVymqr1q8jjASMMRYwEkhDwG9AXIvX2hw5fuynPXtUarVao6GvsGzrPnoxdx40CEIA6bccut26W7h85crS0lL5IfB1rqmw1tQn3IIQtUo1ZNiwrBvXIdL/hZ4izqGutH9EvakIvWlvl56ZuWbdN9XV1Rg2FshuZJCc6fd8q1tSOy3uwYMHIStWXL12retbbz01oqAXcSsEZyRPFzISECLNTJt94R2MBY2INQT9OR8YERELAsHDe71L2IuwMMINB8uBVfTu45x/+9be+H2OPXtS3zKcVim5qKPhHiJUV5rBpMm+eQUFvh999Li0VKsRo67qotQEBlypVL7t5HQiKWnLD9+bN28u5+6ccNd/4ZQmxo4bl3k9e3pQUEV5OZKpAqyF4Pnwhw0eo+v9YUnJrNmzbxcWTp7y0TPb5uoTxWqEjARhQpBAiNilrY1ADDFCAqKn+RKwf1WoK3d9EvosmjQYyigRQHq+/Xbc3l/Tr13bviN20ODBxQ8eVFRUaJ6qKawi8goauNixamLWZNmK5TcLCpavXKlSqdRqdd1GvrEBHQihioqKIUOHnjh1ak/czza2Nq+aUtgohRKEkLm5+aLPP8u8nr04ZKlKrXmyr7ku1ErJuhZFsVqp/DIk5ObtW3PnzzNravY3GdWLXWiNC7OJSDBGIr1fEo+3sWxjhQkRmHN9CRGdbLrv/XQrQSImAsINGK21IvHdwrv3i+7n5928dOlSXm5u5tWr1dXV2dnZ6AXbUpu3bJmXf7Pecl/0bJTtxQsXdvwYGxUZadakiRHjtKCCof5Fy+7yIU8vQhMJqaiocHJy+mTe3H79+rVo0QI9e7Fjw1VBMq6ku/bt+/cP6n/T3v7s76kNmpewG5wz0tPDNn23Z8+eJqam9HZkuOwWPRs6rD+MmL5Vq9VlZWXeo0Z9PGvW2woFwlIErqcbFRoTI3mibiA6YeL+84lB0SHkidTw5HmVWnn+61+tW7cjGIyQDfLUaF2EqZZ08EWT7Po8bmxaFMXsrOzjx479e8e/r17NMDEyMjYxYcml3OckWdVKpbKqurq1hcXIkSPHT5jQ5c0uLVu2lE8E32nYUJCkNuKIBIuUSuW1zGsH9+/fuXPnzZs3m5iaGhsZId3zzm4+JYQolcpqpdLKymrChAkjvLzsu9obGRk1rOFqxLo2QQQhjM0md2/VjNroqjeyAAAaOUlEQVSmCSGoV2eHffPDRSJijDHBiK/uV9VMIVEUqquri+7fLywszEjPuHz58v1793JycsrKy/NyczEhECBua2Nr1qypra2tmZmZo6Njtx7draysrNpZmTU1a+iEkkOd8MWK8oo7hXeKi4ovX7p06eLF7OzsysrKzKtXlU8v9G1mbt7Jxsbc3Lxjh46Ojj2c+/Rp81qb19u2bdq0qQQzG9AgNF5GAtGwGH0d931YQuyTG7AIETDua++0a9ZGguAUFYQ4J3lVV75Ez3ju1Ss3iyHuSH/1hJLnwyWt91w0uEFo1N4/QhAmjyrK3/hkgLlJM3j2qKK0NPrSn2wfcY2EsxMt7ETrcZ9anSjchMURSYInEszRb2rW7zJpKCA05glGCBGhhZn547JSjLGIMMFowgDPpwelYIwR4Uv+VQU2wlKSZkPj2Fda3ebybHxsX0FEkuxMkpxZoAcrJBtBGui5R0KjnmLy5GD5RZEYI4GISrXyc4+gJ/ME88vXAYdayIOcW3D4myhUm08aLl4JjXw2EdEg5KFwKyp9KAq4r83btpZv8FB+Dhw4cOCMpBbKyBONhBggjBD6bGSgAcLNmpghQphzBzhw4MCBw9+W2Rtz+C/CdGfJw/JHrQMU5N85hBDuYOfAgQMHzkj+KkshGOG0nMuKTg4YP7kikQMHDhw4cEbyV3jJ00ML0BMPO2clHDhw4FA3ILw6XcVPb+zgXIQDBw4cuEbyF9WRP4/fQgiDoYtPPQcOHDhwRsKBAwcOHOoBCHwIOHDgwIEDZySvBOjRHWt8pSvDy9FHtdZSD1Vh/e1sZLq75Fb5lzOqutK1aWcdzkKdXK5e5+MjKbYOa3kJqMsZSYNhIXqu89N/kg9CKDY29sMPP1y1alWNPEYPy6mqqho3bpyvr28tUZM8Ba3Nq4enQWi9TbJRHotCDxOjRwpCZwsLCydNmrR8+fK6rQjpPuNWvwwEn6empvr4+EyfPv3vtCQtLW3ChAn+/v61JK8SBvbw4cOJEycuXLjwRWCdVgSj8/J8bCArK2vcuHFTpkx5SeyEcGgI8NFHH2mdr9KnN5Bv3bpVFEVdn3t6eiKELC0t2YfiU7h//z4Ucvz4cXiutZAHDx5AtrNnz9bYYCgEylepVFpxLzMzs76NM202/C0uLh48eHCTJk2gwQ4ODj/++GPjwCh2likm9OvXD3paWlpat3UBVFVVDR8+HC6ORAjZ2dmFhobW+OHq1ashf3l5+XM3IDQ0lHZNz0rR1XI/Pz/4PC8vD57Uychs2rTpRRBnURR/+uknKOT+/ft11Vo9wDWShgGffvopJA4ePMhKFnl5eZAICAjQKjKzmeX3pMInjx8/plKMLgWCfW5gYFBL6R4+UavVWvM0b968XtmLJCd+Hzt2zMLC4sSJE5WVlZAhPT3d19e3odu4qJALOMOeRwnySosWLUxMTOrcrnL58mVTU9MDBw48evSI4tucOXP++OMP/doMi2/PMfhQjvzWSz2frFq1CjOAEPLy8oKWtGnTpg5PV6QyyotQN2lna+wvN229KqatN998E9KLFy9m0eLzzz/HGLdv317XMqvx4nGMsbW1dXh4eExMTGBgIJufVav14KLcyKvL7PvFF1+wUoylpaWkebrsbDV6WaiZ7i9Z5CX5aR/h97333oPnqampkDMpKalVq1Y1OgBqYzOsZY/kD2vv7tLVfTrmZWVlEiNSYGAgIaSkpMTIyEh/d2rTC1osgLOzMzxPSEiAV2lpae3atavRT6Droa4hktuE5SVIblCXlFleXg5vQZZHCI0cOZIQolarzczMUK2djjWSb39/f4kFeOPGjXJ5v5ZV1Ka/LwgMOZmu/4AxNjY29vT0jI+Pz87OpsihUqni4+MRQjNmzKAr9ttvv718+bKxsXFgYKBCoZCIJwih0NDQCxcuuLq6Tp8+HRBOqVSeOHHCxMRk9OjRZmZmFO3WrFlz7dq1Tp06hYSEyHGRPgkLC0tLSzM0NPT393dxcZHcxMACvW2Uxfhffvll7969QUFBLi4u69evT09Pd3Jy+vjjjyW0b8uWLb///jvGeOrUqQMGDIBaNBqNn5+fkZFRRETEunXrMjIyfvjhB0NDQ4zxihUr8vLyqJIhCIK3t/eePXsEQYiMjKSFg8kiOjpasvaoCpibm2ttbQ1pV1dXat8D09zatWthqfv6+r777ru0X35+fhqNZvv27adOnYqOjhZFMTg4GAYHvr19+/ayZcs0Go0oijNnznR2dsYYBwQEqNXqjRs3Nm/eHCH06NGjOXPmqNXqbdu2CYKQmJj4448/+vj4DBkyZM2aNZmZmX369AkODkYIXbp0adOmTSqVau7cuW+//TZUcfLkyW3btk2dOnXgwIExMTEnTpzo2LHjihUroIUzZsw4e/YsHQR2sqqrq2NjYwVBgNE7c+bMDz/8IAiCQqGYOXMmPEcIwXNvb28vL6/vv//+zJkzdnZ2ixcvllM0Qsi//vUvmP0TJ04MGjQIKlIoFHfu3KH5k5KSIiMjEUIqlerDDz8cNmyYnqsGIyIikpOTmzdvvnbtWlNTU0JISkrK1q1bzczMNm/eDC0HHPDy8vrggw/k0tXFixf37t2bk5ODEHJycgoKCjI0NATh7MCBA1pHpqKiYseOHQYGBvDw3r17mzZtun37tlqtHjNmDGgthJCMjIzVq1e7ubn5+flFR0fDyC9duhRuYpfIapILb6qrq1mt4sGDB2FhYTk5OWq1etSoUd7e3ujZ63jT0tJCQ0ONjIxsbGyCg4Nfe+21/x9/JHc/NBRzdnp6OkzZ6dOn4eGNGzfYSdy7d69kcqdOnQqvRowYgRAyMzMDeQqga9euUE5RURE8OXfuHNS1e/duOZ48fPhQku3IkSOSbOPGjaOWZdp+ahpaunSpvHfjx49HCPn4+LDltG/fnnb85MmTklpGjBgBb2HVGRgY9OrVi7p5bt++rXUtHTx4EBIajQaqzs/Pp71jvSOiKFJLiNyjADBy5EhJFQ4ODjQnLF13d3c2w88//wwZYmJiJN+qVCpCCNhwLl68CANIO15VVUUImT17NkJo9OjRxsbG9ENLS0vWoYoQOnz4MHy+YMECsF9ZWlqy5k2lUkkIgRvCdcHjx49FUSwuLm7ZsqXkFTBdQsjSpUsRQp6enmxRBgYGlZWVdLhogqrU5eXlEvSAtNyY5urqChnWrl3LfpuRkSHJeeHCBTo+YEqFD7t27YoQmjx5MiFk48aNVA8TRXHbtm3yXl++fJkQ0qlTJz0jk5ubCw3+4osvJK9at2796NEjURQjIiIQQgMGDGjbti2bobi4WI9/BVCOiiaEkK+//lpuDS4qKqIOp44dO0oyLF68GIZ0z5498KSoqOgl0CjOSBoML6mqqgLMcHNzg4fz589HCHXo0IEQQv0cLi4uUVFRVKAGswwwEoCYmBjqU7127RrLSM6fP08IoSbs1q1bR0dHz5o1C1x2EkZC2YNCoYiMjKTr6uTJk5LG05wsuLu7w4qaOHEifRgVFfXOO+9Q6iCKIlViunfvHhkZuWzZMmoeoYyEhaNHjwJJcnBwCA8PHzVqFFDPyMhIURQhT3BwMFQ9cOBAhJChoaE8QABydujQQeJ+h3R4eDhkGDZs2NatW4EXIoTAg8KKmUOGDAEpGwB4GKRnzpwZHh4+Z84cykiAlFy6dAlqSUpKoiqCRqOZN28eLWfLli2geUBFbm5u0dHR9C10gQ0xCgsLo3+HDh1KCImOju7Tpw88CQ8P37p1a3h4eGBgIOtsB8UIIbRp06bo6GjKwB4+fCiKIp0LMMjQedyxYwcrTMDv66+/jhAC1UErY0YIvfvuu1u2bAkPD6ehJbm5uRJGQgihvvqNGzcCqd25c6coinPnzmUHmRDy1ltvgeOHZSTQtejo6A4dOixYsCAiImL79u3QU0dHR0LIrl27hg8fTmNYwsPDw8PD6YK6efOmKIqnTp2Cvz169IiKiqJV9+7dmxASFRVFR+af//znjBkzIL1kyRJ9/mqGkYiimJqaCl/Z29tHRUXR6evRowfkp9MXEhKybds2ylSSk5NFUaSyIGckHKRKiYeHB0KoZcuW8AQQZeXKlYQQkLBee+01+gmY+EF4B0Zibm4OH1ZUVMC369atI4RIGMmuXbsQQmAlh3rT0tJEUWQZCSEkLi6OlsnqPYMGDZKQCa2M5IMPPoC3oIsYGxurVCqWiH/55ZdU6TE2NqaljR07FmwRLCNRKBQlJSUSuzkbwgtpqiIQQjQaDeWsrJzItqFz585aRUh427dvX/qEqkRAxYC+BwUFQYHff/89q3kAyQACJyclly5dghpZRkIIodSKkgYwlbi7u0MtoCJQDYaSnsePH0N+R0dHtsAJEyawIjwb6lNaWpqZmQnpnJwcigmgM0GoVUhICGQoKCiA8lu3bo0QmjBhAhvvxL5q0aKFVi5Cde6QkBB/f39grgihK1euiKLIMpLc3FxIZ2RkwLe3bt26desWOz5qtRoK1MVIaANSUlICAgL8/f1Bd6FoQ6UisD0SQn777TfKSAghvXv3RghZWVnRxlN96P79+1R0gJVCCHFwcGBFwNpoJCBRtW3bllaxZMkSKLawsJBGWu7evZtmANc9aGAvmZFwZ3uDcZMQQr755huEUElJSX5+PjXgfPnllwih/fv3AxJT3+bRo0dhKdJCzM3NJeFbZWVlcn8gmMhARgOCqFAo5E0CRlJaWkpr3LdvH4Q26doiALwBIC4ujs1gZGQEFmpK38HhCetBqVTSWoDYXblyhbX8bt68GYgUIQTK6dKlS2BgoIuLC9uSHTt2QOLu3bu3bt2CDsLOGNpmttj8/HytXll4CFIqjYCSDxGYvzDGQNFoZqCM27dvxxgPHDiQEkc9gQAsUJEc5nHIkCGSWiRuWFNTU/hLJX1JQLbkFnp2fhFC4A9nUUjSYBBfEEKgC4KYIvHMAc+jyq58PMeMGePg4LB8+fKIiAgaqgvzztYF9kmqiBNC2rdvb2VlJelOjV6B69evY4z79esXHh4eERFBuWYtHQx3795FCE2aNImOHngvYEXQbNSgBxZCkKhqGUB18+ZNhBAtFiFE9aSHDx+ePn0a0tRfCMoKQgii4F7ytifubG8wgVsIIVtbW/g7f/58ME916NCBJRZyoKKWroUhRzg2Wpd160my6YpctLOz0+UjBUFYK8nWWgsVsuQgIZpg94c0eKRv3LhBfUg0ZtrCwgKeTJ8+HUgbUEm2SZBTEAR2B4yktZAH3sJzqsTUJrpp/vz5AwYMWLly5f79+0+dOmVra6vRaCh3p/Ga8nDt2iCJ1sGEV3RmqcNcT/wP7ZG8ZPYVW5fWoEEYulatWgGBKykpAZbPcuiUlBSw6bu5uY0fP97ExMTPz0/rSFI5Q+7Pr32cEsb4/fffh/Tq1atbtGixbds2GnogaZueCQUEqE1Um9aoOf0Ag0z7KymEToFGo5EUCK9ecpA610gajEaCMTYxMQGpJCkpCazDEK9JhRELCwuJyknjT2oP/fv3Z4VHjLHcvYkQ6tmzJ0KoadOmkhqTk5N1iYSSkHb9uA6ZQRliTVsA//vf/7QuTlEUfXx8DAwMMjIywsLCNm/e/ODBg6FDh0IeQRDWrVuHENq3b9/PP/+MEIqNjZVTQ4wxjVwYO3Ys2x1qpAKTN+3Fhg0baBW1IfcuLi7x8fGPHj0CYxG4Z6GWCxcuQDosLKxOkIdqjXT7G6gO7ERIpgxjDGgA0jdlloAVw4YN+0uxPKwu6OnpyaJBbGxsWVlZYmIijZUICAiYMmWKLtwAFRMhlJeXB62qqKjIzs7GGFNFjfrVtIZdUHMfQujIkSOLFi0KCgpidRqMMcsptWIySCRbt26leWgAhUQ9em6AEAkWP3fu3AkJGxubbt26QRpsbjBc586dQwhBmDXXSDjoXJMY43Xr1h04cAA0a9ZYNHny5IULFxYXF3fu3NnDw0MUxfz8/JMnT6akpOiyeOiqxcfHZ9asWWq1ulmzZn5+foWFhbt37z5z5oy9vT2bbdKkSTNmzCgvL7exsRkxYoQoigUFBadPn05ISAAeIzeYJCQklJWVUXotJ5TyPRMTJ06cMmWKUql84403vLy8CCF37txJSUmJi4vr27evZHCoHK3RaDZs2ADO4ejo6BEjRoCRASIUIJwJWujm5iZpAEjrHh4exsbGSqVy9+7dDg4OgwcPRggdOnQoJycnMDBw2rRpkZGR2dnZrq6uCoXi7NmzoP1ANHZtZAI3N7du3bpVV1dDg4E+gvjp6+t7+vTp8+fPUxn5b4KFhUVgYGBWVhYQ1iVLlkAfaVhzcHDw9evXJTLHoEGDQC2zsbEJCAgwNTUNCwuDCaIBEbXsLPiQbG1tc3JykpOTra2tPTw8DA0Njx49evXq1dzcXOphGj9+fLt27ag/Q46uzs7OJiYm1dXVPXv29Pf3F0UxKipqzZo1Cxcu9PT0BP+/QqEYOnQotY9phWbNmhUVFY0dO3bSpElZWVkJCQlsjZQZ+Pr6FhcXx8bGSjBzxowZQUFB5eXlXbt2dXd3z87OPnz4MELos88+e469nFpj62fOnJmSklJZWdmlS5fhw4fn5OSA+To4ONjU1NTOzq5du3aFhYUTJ06Mj49v06bN9u3bAZfmzZunVZF6sbtJuB+7gcZugVmGfUs9pSzk5+dTLz0ckcIGXC1dupQ9IgWc6oQQNtCI2ruosz01NRWyaaWb2dnZklBats0s/PbbbzT8t0mTJpCZWpNmz54NJbCLnMKVK1cIIbTkxMREOg7seUoUvvvuO+r+pfEtdnZ2ek6PUCqVrq6uknIcHR3hE2obofDJJ59INpfFx8dD5mPHjslNcKztGxp26NAhSYGgr4BJkLpzwWNPQ2ZXrVoFtVDptaqqShRFGmjEBqF27tyZdXdLFJf//ve/NC2K4sWLFyVNNTY2Bs+2KIrU91tZWQmlQUWenp5aDxohhEj2cyCE2rdvX1FRQQihIjbrjDl//jx7RApE7qalpUkKuXjxIlTk5OT0p7FFEKZOnYqeOp8lR6RImDTdLEnbDJ42qv0cP36cpiEDnQ52HqGzoF+CHQ8ygyEaNhJpPYKFzsWaNWvoBC1atEhSxXvvvUe/unPnDhvNDwAxk5IjUvSce1RXwDWSBuYmMTExSUpKgmiQd955h5UyxowZo9Fo4uPjAdetrKx69eoFRPPTTz91d3eHzUpgItu0aZMoiu+//z7GuHnz5uvXrzcwMHBwcIDS/Pz8hg8fvmfPHrVabW1tDRFWTZs2hWw9evQAMdPDwwOsZ9evX4cQz169enXp0kViMzExMYmIiKD7qClA9O2cOXP69etHffsGBgZhYWEqlcrNzQ1qgcVz6NChrKwskK8VCkW3bt0gbOnbb78VBMHZ2RkqrayshGW8dOnS1q1bAwXJz8+fNWvWxx9/DE06ffo0DMv27dv1SGqGhobJyclXrlyBI8hAjaDBl4cOHUpPT4eIBtjLCT5nuj9ZFMX+/ftDF1xcXOCJgYEBIeTKlSuJiYmgfwwePBgUOGBOGRkZENk8bNgwe3t7Ozs7lUoFRG3atGk2NjZGRkZQCMZ4w4YNKpVqzJgxdKBCQ0M1Go1k49vdu3f/85//3Lt3r3fv3v3792ddQX/88cdPP/2k0Wj69evXtGnT4cOHb9iwQRRFcE1BZxMTE2GDhaurK4wzlDBx4kQLCwtBEExMTGh7ioqK6I5I+dbUuLi4nJychIQEYHWDBw8G0yWEbB0+fDgzM9PMzGzatGlxcXEFBQXW1tYY49GjR5uYmGCMgW4qFIrS0tJff/21qKioVatWPj4+dB/+uXPn4uPjb9y48cYbb3h7e+fk5Dg6OoK6A+GLgiDArhdnZ+eCgoL9+/dXVlY6OTn94x//CA0NpcoEhDLu2rWrsrKye/fu1tbWlpaW69evF0URmCXg1YIFCw4fPlxWViYIwqhRo2DzE0LI3d19w4YNgiDAIUAY4yVLlmRlZVG1WLIJEdLR0dElJSXUo04IWb169Zw5cw4ePPj48WOMsbe3d8eOHalzyNLSsry8PDk5OTU1VRCEbt26sfuW+vfvv379ekEQYBW8cNs74RdbNRwuwmIem9DvcSXaDg9mMVjr8SdgKaaEQFIXefZUV2oRoh/K3bnsWbOS9sjbVktPsnwo1q5du2jRIgMDg5KSkmbNmiGEvLy8wOFBmxoQEBAZGQntZPceaq1Ra7N1WQxITYfdag1hkAQgSMZE3gD5X9YzT0tbtGgRhIcplUogtTW6xHVNkP5sugqUdFzraTR/CR/kNbLmU12xBpIyJXQc1eJ0bT1t1uVF19VUedvksSfyh5I+SozG8rc1Bl9wH8kr7W+ny0AXzZUvMPky04Pcksx6YntoZlbkpN/S0zV0LRWtywNpC8KRr1VdcV/wCpwZGo2GxjoDfPXVV5SOgOEOwhP0cBE97E0ytnr6oot/6KLF5Nlz3eU1Skg5kR0Ir6c7ukQQ9q1WDzx9pYflyBuph7tIxlOerpE9SCrSWrI8skuOMFpxW1e9euQJ+fLRlVlXG3QJi3Ic0yqO1HKuXxDwqK2GxEVYkqELgfTk0Ur35SxH68Jmi9V1lJYkv3zla2UnWtuGnt0NIO+XVqUEY9ynT5+YmBjWhe7u7v7LL7/AeZEYYxrmHxUVJQ9jrXG1y8mK1rScsuuaHTYh76+uMdc6uZJBoyeXSEpGsp0WEnzQU7hW5JEzVz24IT+MVitH0SMryMdZPoASRqh1jnSNM0ug5cXWOKeSevWIffIZ0TrjetayrgZLaMVLOP2Xm7Y4NBLTX22sT3qOnnwVxofjCQeukXDgUFvrn9xEIz91XG4nbHzMQ5LgwIFrJBw41Ew3tXqttbp5kY6jQRqfIqInoIADB85IOHD4ayT1FbTwvLId58AZCQcOHDhwaDDAFV4OHDhw4MAZCQcOHDhw4IyEAwcOHDg0UPg/EZyCAsLAcW8AAAAASUVORK5CYII=" /><br />
<br />
-Version: VECTO 3.2 / VectoCore 3.2.0 / VectoCmd 3.2.0</p>
+Version: VECTO 3.3 / VectoCore 3.3.0 / VectoCmd 3.3.0</p>
<hr />
<p>VECTO is a tool for the calculation of energy consumption and CO<sub>2</sub> emissions of vehicles. It models the components of a heavy-duty vehicle and simulates a virtual drive on a route. The goal is to provide a standardized way of calculating the energy consumption (fuel consumption) and corresponding CO<sub>2</sub> emissions.</p>
<p>This User Manual consists of 4 Parts:</p>
@@ -272,7 +272,7 @@ Version: VECTO 3.2 / VectoCore 3.2.0 / VectoCmd 3.2.0</p>
</dd>
</dl></li>
</ul>
-<p>This user manual describes verson 3.2.x of Vecto.</p>
+<p>This user manual describes verson 3.3.x of Vecto.</p>
</div>
<div id="user-interface" class="section level1">
<h1>User Interface</h1>
@@ -6591,6 +6591,34 @@ CycleTime,UnknownCycleName,3600</code></pre>
</div>
<div id="changelog" class="section level1">
<h1>Changelog</h1>
+<p><strong>VECTO 3.3.0</strong></p>
+<p><strong><em>Build 1250 (2018-06-04)</em></strong></p>
+<ul>
+<li>Improvement
+<ul>
+<li>[VECTO-665] - Adding style information to XML Reports</li>
+<li>[VECTO-669] - Group 1 vehicle comprises vehicles with gross vehicle weight > 7.5t</li>
+<li>[VECTO-672] - Keep manual choice for “Validate dataâ€</li>
+<li>[VECTO-682] - VTP Simulation in declaration mode</li>
+<li>[VECTO-652] - VTP: Check Cycle matches simulation mode</li>
+<li>[VECTO-683] - VTP: Quality and plausibility checks for recorded data from VTP</li>
+<li>[VECTO-685] - VTP Programming of standard VECTO VTP report</li>
+<li>[VECTO-689] - Additional Tyre sizes</li>
+<li>[VECTO-702] - Hashing tool: adapt warnings</li>
+<li>[VECTO-667] - Removing NCV Correction Factor</li>
+<li>[VECTO-679] - Engine n95h computation gives wrong (too high) engine speed (above measured FLD, n70h)</li>
+<li>[VECTO-693] - extend vehicle performance in manufacturer record</li>
+</ul></li>
+<li>Bugfixes
+<ul>
+<li>[VECTO-656] - Distance computation in vsum</li>
+<li>[VECTO-666] - CF_RegPer no effect in vehicle simulation – added to the engine correction factors</li>
+<li>[VECTO-687] - Saving a Engine-Only Job is not possible</li>
+<li>[VECTO-695] - Bug in vectocmd.exe - process does not terminate</li>
+<li>[VECTO-699] - Output in manufacturer report and customer report (VECTO) uses different units than described in legislation</li>
+<li>[VECTO-700] - errorr in simulation with 0 stop time at the beginning of the cycle</li>
+</ul></li>
+</ul>
<p><strong>VECTO 3.2.1</strong></p>
<p><strong><em>Build 1133 (2018-02-07)</em></strong></p>
<ul>
diff --git a/Documentation/VectoResults_3.3.0.1250.xlsx b/Documentation/VectoResults_3.3.0.1250.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..cd29096806df1bb05918c9ba533ca4e3189b526a
Binary files /dev/null and b/Documentation/VectoResults_3.3.0.1250.xlsx differ
diff --git a/Documentation/XML/VectoParameters.html b/Documentation/XML/VectoParameters.html
index 518519f0861c361224acb1511156090f58e16a46..9db3c812e6b37872549c9f294df063d7371c9ef2 100644
--- a/Documentation/XML/VectoParameters.html
+++ b/Documentation/XML/VectoParameters.html
@@ -222,7 +222,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
<!--/*--></root><!--*/--></style></head><body>
<h1>Vecto Input Parameters</h1>
<div class="schemaVersion">Schema Version: 0.6 1.0 1.0</div>
- <div class="generated">Generated: 28.05.2018 14:40</div>
+ <div class="generated">Generated: 04.06.2018 14:04</div>
<div class="nextParameter">Next free parameter: 269</div>
<table border="1" class="parameters">
<thead>
diff --git a/HashingTool/Properties/Version.cs b/HashingTool/Properties/Version.cs
index 73b45c2c1c60a2d69dd9ec0353807ac421766e81..da2a6ce07434258a47dc4f1cb286d7e0e8ed8421 100644
--- a/HashingTool/Properties/Version.cs
+++ b/HashingTool/Properties/Version.cs
@@ -11,7 +11,7 @@
* 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
@@ -30,5 +30,5 @@
*/
using System.Reflection;
-[assembly: AssemblyVersion("0.2.0.1133")]
-[assembly: AssemblyFileVersion("0.2.0.1133")]
+[assembly: AssemblyVersion("0.2.0.1250")]
+[assembly: AssemblyFileVersion("0.2.0.1250")]
diff --git a/VectoCommon/VectoCommon/Models/SimulationType.cs b/VectoCommon/VectoCommon/Models/SimulationType.cs
index 4d5c5c587a75f4e860d539fea916e477366dd482..c62ad7faba703c1d0d02aa78df57cb697406b3a9 100644
--- a/VectoCommon/VectoCommon/Models/SimulationType.cs
+++ b/VectoCommon/VectoCommon/Models/SimulationType.cs
@@ -1,4 +1,35 @@
-using System;
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2017 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
+*/
+
+using System;
namespace TUGraz.VectoCore.InputData.Reader.Impl {
[Flags]
diff --git a/VectoCommon/VectoCommon/Properties/Version.cs b/VectoCommon/VectoCommon/Properties/Version.cs
index e439021ada7de912554531de13ec82eda6c4564b..19ad6af946ae6becb21b3105d2fde0531adbed04 100644
--- a/VectoCommon/VectoCommon/Properties/Version.cs
+++ b/VectoCommon/VectoCommon/Properties/Version.cs
@@ -30,5 +30,5 @@
*/
using System.Reflection;
-[assembly: AssemblyVersion("3.2.1.1133")]
-[assembly: AssemblyFileVersion("3.2.1.1133")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.3.0.1250")]
+[assembly: AssemblyFileVersion("3.3.0.1250")]
\ No newline at end of file
diff --git a/VectoCommon/VectoHashing/Properties/Version.cs b/VectoCommon/VectoHashing/Properties/Version.cs
index a3e81eb57441c90f6131874290219289328e6c4b..10c9c5e1ec7156b0c4e9ead1b57ad479e7f428d7 100644
--- a/VectoCommon/VectoHashing/Properties/Version.cs
+++ b/VectoCommon/VectoHashing/Properties/Version.cs
@@ -30,5 +30,5 @@
*/
using System.Reflection;
-[assembly: AssemblyVersion("1.2.0.1133")]
-[assembly: AssemblyFileVersion("1.2.0.1133")]
+[assembly: AssemblyVersion("1.2.0.1250")]
+[assembly: AssemblyFileVersion("1.2.0.1250")]
diff --git a/VectoConsole/Properties/Version.cs b/VectoConsole/Properties/Version.cs
index 33ca99df0f4ec4a77e5eee733d498194ad6048f3..19ad6af946ae6becb21b3105d2fde0531adbed04 100644
--- a/VectoConsole/Properties/Version.cs
+++ b/VectoConsole/Properties/Version.cs
@@ -11,7 +11,7 @@
* 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
@@ -30,5 +30,5 @@
*/
using System.Reflection;
-[assembly: AssemblyVersion("3.2.1.1133")]
-[assembly: AssemblyFileVersion("3.2.1.1133")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.3.0.1250")]
+[assembly: AssemblyFileVersion("3.3.0.1250")]
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLManufacturerReportReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLManufacturerReportReader.cs
index 82d1b095e6a2ee7fcec27348df062e1d7c22dc31..b7e4f6900623b7431d8c1f0014af3d304e36c429 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLManufacturerReportReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLManufacturerReportReader.cs
@@ -1,4 +1,35 @@
-using System;
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2017 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
+*/
+
+using System;
using System.Collections.Generic;
using System.Xml;
using TUGraz.VectoCommon.Hashing;
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
index d664f4bb89b60f63e2f972651ed9f747f6d25b64..c76a1a3c04efdbe585f829a6758ab74a6b06c8a9 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
@@ -1,4 +1,35 @@
-using System;
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2017 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
+*/
+
+using System;
using System.Collections.Generic;
using System.Linq;
using TUGraz.VectoCommon.Exceptions;
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs
index 59f188415dae0a7d2d788835fd917e100f27ff44..f9face57e24637c892b29aaf2c3daba527efdd44 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs
@@ -1,4 +1,35 @@
-using System;
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2017 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
+*/
+
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml;
diff --git a/VectoCore/VectoCore/Properties/Version.cs b/VectoCore/VectoCore/Properties/Version.cs
index 7e94075668471c23ac6b1a84f96417283a3ed51b..875fea7840a24998d4e328986502ff4cc0f501b4 100644
--- a/VectoCore/VectoCore/Properties/Version.cs
+++ b/VectoCore/VectoCore/Properties/Version.cs
@@ -30,5 +30,5 @@
*/
using System.Reflection;
-[assembly: AssemblyVersion("3.2.1.1133")]
-[assembly: AssemblyFileVersion("3.2.1.1133")]
+[assembly: AssemblyVersion("3.3.0.1250")]
+[assembly: AssemblyFileVersion("3.3.0.1250")]
diff --git a/VectoCore/VectoCore/Utils/VectoVersionCore.cs b/VectoCore/VectoCore/Utils/VectoVersionCore.cs
index 4d6a9619af5a0a663b0e675a83ba5e7bc08e6511..9435e8f935a3c3d20524b9b40ce9615b6b00815c 100644
--- a/VectoCore/VectoCore/Utils/VectoVersionCore.cs
+++ b/VectoCore/VectoCore/Utils/VectoVersionCore.cs
@@ -36,7 +36,7 @@ namespace TUGraz.VectoCore.Utils
public static string VersionNumber
{
get {
- return "3.2.1.1133";
+ return "3.3.0.1250";
}
}
diff --git a/VectoCore/VectoCore/Utils/XMLHelper.cs b/VectoCore/VectoCore/Utils/XMLHelper.cs
index 72bc76be707d8b1f7035172504a1226a539bf8de..8f1620bacf01ee6a4e6ceafd732714e822baef3c 100644
--- a/VectoCore/VectoCore/Utils/XMLHelper.cs
+++ b/VectoCore/VectoCore/Utils/XMLHelper.cs
@@ -1,4 +1,35 @@
-using System;
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2017 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
+*/
+
+using System;
using System.Xml.Linq;
using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCommon.Utils;
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
deleted file mode 100644
index 5cfadf7b3beab36b058c4a05a498e8d150b1c302..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>TUGraz.VectoCore</RootNamespace>
- <AssemblyName>VectoCore</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <CodeContractsAssemblyMode>1</CodeContractsAssemblyMode>
- <NuGetPackageImportStamp>5f3566e7</NuGetPackageImportStamp>
- <TargetFrameworkProfile />
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
- <CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
- <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>
- <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>
- <CodeContractsRuntimeThrowOnFailure>True</CodeContractsRuntimeThrowOnFailure>
- <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>
- <CodeContractsRuntimeSkipQuantifiers>False</CodeContractsRuntimeSkipQuantifiers>
- <CodeContractsRunCodeAnalysis>False</CodeContractsRunCodeAnalysis>
- <CodeContractsNonNullObligations>True</CodeContractsNonNullObligations>
- <CodeContractsBoundsObligations>True</CodeContractsBoundsObligations>
- <CodeContractsArithmeticObligations>True</CodeContractsArithmeticObligations>
- <CodeContractsEnumObligations>True</CodeContractsEnumObligations>
- <CodeContractsRedundantAssumptions>True</CodeContractsRedundantAssumptions>
- <CodeContractsAssertsToContractsCheckBox>False</CodeContractsAssertsToContractsCheckBox>
- <CodeContractsRedundantTests>True</CodeContractsRedundantTests>
- <CodeContractsMissingPublicRequiresAsWarnings>True</CodeContractsMissingPublicRequiresAsWarnings>
- <CodeContractsMissingPublicEnsuresAsWarnings>True</CodeContractsMissingPublicEnsuresAsWarnings>
- <CodeContractsInferRequires>True</CodeContractsInferRequires>
- <CodeContractsInferEnsures>True</CodeContractsInferEnsures>
- <CodeContractsInferEnsuresAutoProperties>True</CodeContractsInferEnsuresAutoProperties>
- <CodeContractsInferObjectInvariants>True</CodeContractsInferObjectInvariants>
- <CodeContractsSuggestAssumptions>True</CodeContractsSuggestAssumptions>
- <CodeContractsSuggestAssumptionsForCallees>False</CodeContractsSuggestAssumptionsForCallees>
- <CodeContractsSuggestRequires>True</CodeContractsSuggestRequires>
- <CodeContractsNecessaryEnsures>False</CodeContractsNecessaryEnsures>
- <CodeContractsSuggestObjectInvariants>True</CodeContractsSuggestObjectInvariants>
- <CodeContractsSuggestReadonly>False</CodeContractsSuggestReadonly>
- <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
- <CodeContractsShowSquigglies>True</CodeContractsShowSquigglies>
- <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
- <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
- <CodeContractsCustomRewriterAssembly />
- <CodeContractsCustomRewriterClass />
- <CodeContractsLibPaths />
- <CodeContractsExtraRewriteOptions />
- <CodeContractsExtraAnalysisOptions />
- <CodeContractsSQLServerOption />
- <CodeContractsBaseLineFile>baseline.xml</CodeContractsBaseLineFile>
- <CodeContractsCacheAnalysisResults>True</CodeContractsCacheAnalysisResults>
- <CodeContractsSkipAnalysisIfCannotConnectToCache>False</CodeContractsSkipAnalysisIfCannotConnectToCache>
- <CodeContractsFailBuildOnWarnings>True</CodeContractsFailBuildOnWarnings>
- <CodeContractsBeingOptimisticOnExternal>True</CodeContractsBeingOptimisticOnExternal>
- <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
- <CodeContractsReferenceAssembly>%28none%29</CodeContractsReferenceAssembly>
- <CodeContractsAnalysisWarningLevel>3</CodeContractsAnalysisWarningLevel>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>
- </DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
- <Reference Include="Microsoft.VisualBasic" />
- <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="NLog">
- <HintPath>..\..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System.Core" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Windows.Forms.DataVisualization" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Xml.Linq" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Configuration\Constants.cs" />
- <Compile Include="InputData\AuxiliaryFileHelper.cs" />
- <Compile Include="InputData\FileIO\JSON\IJSONVehicleComponents.cs" />
- <Compile Include="InputData\FileIO\JSON\JSONComponentInputData.cs" />
- <Compile Include="InputData\FileIO\JSON\JsonExtensionMethods.cs" />
- <Compile Include="InputData\FileIO\XML\Declaration\AbstractDeclarationXMLComponentDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationAirdragDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationAngledriveDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationAuxiliaryDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationAxlegearDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationEngineDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationGearboxDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationJobInputDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationRetarderDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationTorqueConverterDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationVehicleDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationInputDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Declaration\XMLManufacturerReportReader.cs" />
- <Compile Include="InputData\FileIO\XML\Engineering\AbstractEngineeringXMLComponentDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringAirdragDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringAngledriveDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringAuxiliaryDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringAxlegearDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringDriverDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringEngineDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringGearboxDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringInputDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringJobInputDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringRetarderDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringTorqueConverterDataProvider.cs" />
- <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringVehicleDataProvider.cs" />
- <Compile Include="InputData\FileIO\JSON\JSONEngineData.cs" />
- <Compile Include="InputData\FileIO\JSON\JSONGearboxData.cs" />
- <Compile Include="InputData\FileIO\JSON\JSONInputData.cs" />
- <Compile Include="InputData\FileIO\JSON\JSONInputDataFactory.cs" />
- <Compile Include="InputData\FileIO\JSON\JSONVehicleData.cs" />
- <Compile Include="InputData\Impl\InputData.cs" />
- <Compile Include="InputData\IVectoRunDataFactory.cs" />
- <Compile Include="InputData\Reader\ComponentData\AccelerationCurveReader.cs" />
- <Compile Include="InputData\Reader\ComponentData\AuxiliaryDataReader.cs" />
- <Compile Include="InputData\Reader\ComponentData\CrossWindCorrectionCurveReader.cs" />
- <Compile Include="InputData\Reader\ComponentData\PTOIdleLossMapReader.cs" />
- <Compile Include="InputData\Reader\ComponentData\RetarderLossMapReader.cs" />
- <Compile Include="InputData\Reader\ComponentData\TorqueConverterDataReader.cs" />
- <Compile Include="InputData\Reader\ComponentData\TransmissionLossMapReader.cs" />
- <Compile Include="InputData\Reader\DataObjectAdapter\AbstractSimulationDataAdapter.cs" />
- <Compile Include="InputData\Reader\DataObjectAdapter\DeclarationDataAdapter.cs" />
- <Compile Include="InputData\Reader\DataObjectAdapter\EngineeringDataAdapter.cs" />
- <Compile Include="InputData\Reader\DrivingCycleDataReader.cs" />
- <Compile Include="InputData\Reader\FullLoadCurveReader.cs" />
- <Compile Include="InputData\Reader\Impl\DeclarationModeVectoRunDataFactory.cs" />
- <Compile Include="InputData\Reader\Impl\DeclarationVTPModeVectoRunDataFactory.cs" />
- <Compile Include="InputData\Reader\Impl\DrivingCycleProxy.cs" />
- <Compile Include="InputData\Reader\Impl\EngineeringModeVectoRunDataFactory.cs" />
- <Compile Include="InputData\Reader\Impl\EngineOnlyVectoRunDataFactory.cs" />
- <Compile Include="InputData\Reader\ShiftPolygonReader.cs" />
- <Compile Include="Models\Declaration\AuxDemandEntry.cs" />
- <Compile Include="Models\Declaration\AuxiliaryTypeHelper.cs" />
- <Compile Include="Models\Connector\Ports\IDriverDemandPort.cs" />
- <Compile Include="Models\Connector\Ports\IDrivingCyclePort.cs" />
- <Compile Include="Models\Connector\Ports\Impl\Response.cs" />
- <Compile Include="Models\Connector\Ports\IFvPort.cs" />
- <Compile Include="Models\Connector\Ports\ITnPort.cs" />
- <Compile Include="Models\Declaration\FuelData.cs" />
- <Compile Include="Models\Declaration\PTOTransmission.cs" />
- <Compile Include="Models\Declaration\IDeclarationAuxiliaryTable.cs" />
- <Compile Include="Models\SimulationComponent\Data\AngledriveData.cs" />
- <Compile Include="Models\SimulationComponent\Data\Engine\FuelConsumptionMapReader.cs" />
- <Compile Include="Models\SimulationComponent\Data\PTOData.cs" />
- <Compile Include="Models\SimulationComponent\ILossMap.cs" />
- <Compile Include="Models\SimulationComponent\Data\PTOLossMap.cs" />
- <Compile Include="Models\SimulationComponent\Impl\AbstractGearbox.cs" />
- <Compile Include="Models\SimulationComponent\Impl\ATGearbox.cs" />
- <Compile Include="Models\SimulationComponent\Impl\ATShiftStrategy.cs" />
- <Compile Include="Models\SimulationComponent\Impl\BaseShiftStrategy.cs" />
- <Compile Include="Models\SimulationComponent\Impl\DrivingCycleEnumerator.cs" />
- <Compile Include="Models\SimulationComponent\Impl\EngineFanAuxiliary.cs" />
- <Compile Include="Models\SimulationComponent\Impl\VTPCombustionEngine.cs" />
- <Compile Include="Models\SimulationComponent\Impl\MeasuredSpeedDrivingCycle.cs" />
- <Compile Include="Models\SimulationComponent\Impl\PTOCycleController.cs" />
- <Compile Include="Models\SimulationComponent\Impl\PWheelCycle.cs" />
- <Compile Include="Models\SimulationComponent\Impl\TorqueConverter.cs" />
- <Compile Include="Models\SimulationComponent\Impl\IdleControllerSwitcher.cs" />
- <Compile Include="Models\SimulationComponent\Impl\VTPGearbox.cs" />
- <Compile Include="Models\Simulation\Data\ModalResultField.cs" />
- <Compile Include="InputData\Reader\Impl\EngineeringVTPModeVectoRunDataFactory.cs" />
- <Compile Include="Models\SimulationComponent\Impl\VTPCycle.cs" />
- <Compile Include="Utils\XMLHelper.cs" />
- <Compile Include="OutputData\XML\XMLVTPReport.cs" />
- <Compile Include="OutputData\VTPReport.cs" />
- <Compile Include="OutputData\ModFilter\ActualModalDataFilter.cs" />
- <Compile Include="OutputData\ModFilter\ModalData1HzFilter.cs" />
- <Compile Include="OutputData\XML\AbstractXMLWriter.cs" />
- <Compile Include="OutputData\XML\AttributeMappings.cs" />
- <Compile Include="OutputData\XML\XMLCustomerReport.cs" />
- <Compile Include="OutputData\XML\XMLDeclarationReport.cs" />
- <Compile Include="OutputData\XML\XMLDeclarationWriter.cs" />
- <Compile Include="OutputData\XML\XMLEngineeringWriter.cs" />
- <Compile Include="OutputData\XML\XMLManufacturerReport.cs" />
- <Compile Include="Utils\ProviderExtensions.cs" />
- <Compile Include="Models\Declaration\AirDrag.cs" />
- <Compile Include="Models\Declaration\Fan.cs" />
- <Compile Include="Models\Declaration\HVAC.cs" />
- <Compile Include="Models\Declaration\LACDecisionFactor.cs" />
- <Compile Include="Models\Declaration\Payloads.cs" />
- <Compile Include="Models\Declaration\PneumaticSystem.cs" />
- <Compile Include="Models\Declaration\PT1.cs" />
- <Compile Include="Models\Declaration\Segments.cs" />
- <Compile Include="Models\Declaration\StandardBodies.cs" />
- <Compile Include="Models\Declaration\SteeringPump.cs" />
- <Compile Include="Models\Declaration\VehicleClass.cs" />
- <Compile Include="Models\Declaration\Wheels.cs" />
- <Compile Include="Models\Declaration\WHTCCorrection.cs" />
- <Compile Include="Models\SimulationComponent\Data\CrosswindCorrectionCdxALookup.cs" />
- <Compile Include="Models\SimulationComponent\Data\AuxiliaryData.cs" />
- <Compile Include="Models\SimulationComponent\Data\AuxSupplyPowerReader.cs" />
- <Compile Include="Models\SimulationComponent\Data\AxleGearData.cs" />
- <Compile Include="Models\SimulationComponent\Data\CycleData.cs" />
- <Compile Include="Models\SimulationComponent\Data\AccelerationCurve.cs" />
- <Compile Include="Models\Declaration\DeclarationData.cs" />
- <Compile Include="Models\Declaration\ElectricSystem.cs" />
- <Compile Include="Models\Declaration\LookupData.cs" />
- <Compile Include="Models\Declaration\Mission.cs" />
- <Compile Include="Models\Declaration\MissionType.cs" />
- <Compile Include="Models\SimulationComponent\Data\DriverData.cs" />
- <Compile Include="Models\SimulationComponent\Data\ICrossWindCorrection.cs" />
- <Compile Include="Models\SimulationComponent\Data\CrosswindCorrectionVAirBeta.cs" />
- <Compile Include="Models\SimulationComponent\IAxlegear.cs" />
- <Compile Include="Models\SimulationComponent\IBrakes.cs" />
- <Compile Include="Models\SimulationComponent\IIdleController.cs" />
- <Compile Include="Models\SimulationComponent\IDriverActions.cs" />
- <Compile Include="Models\SimulationComponent\IDriverStrategy.cs" />
- <Compile Include="Models\SimulationComponent\IDrivingCycleInfo.cs" />
- <Compile Include="Models\SimulationComponent\IAuxPort.cs" />
- <Compile Include="Models\SimulationComponent\Impl\AMTShiftStrategy.cs" />
- <Compile Include="Models\SimulationComponent\Impl\Angledrive.cs" />
- <Compile Include="Models\SimulationComponent\Impl\Brakes.cs" />
- <Compile Include="Models\SimulationComponent\Impl\BusAuxiliariesAdapter.cs" />
- <Compile Include="Models\SimulationComponent\Impl\CycleGearbox.cs" />
- <Compile Include="Models\SimulationComponent\Impl\DefaultDriverStrategy.cs" />
- <Compile Include="Models\SimulationComponent\Impl\DummyRetarder.cs" />
- <Compile Include="Models\SimulationComponent\Impl\EngineAuxiliary.cs" />
- <Compile Include="Models\SimulationComponent\Impl\EngineOnlyCombustionEngine.cs" />
- <Compile Include="Models\SimulationComponent\Impl\MTShiftStrategy.cs" />
- <Compile Include="Models\SimulationComponent\Impl\TransmissionComponent.cs" />
- <Compile Include="Models\SimulationComponent\IShiftStrategy.cs" />
- <Compile Include="Models\SimulationComponent\Impl\ShiftStrategy.cs" />
- <Compile Include="Models\Simulation\DataBus\IAxlegearInfo.cs" />
- <Compile Include="Models\Simulation\DataBus\IClutchInfo.cs" />
- <Compile Include="Models\Simulation\DataBus\IDriverInfo.cs" />
- <Compile Include="Models\Simulation\DataBus\IWheelsInfo.cs" />
- <Compile Include="Models\Simulation\DataBus\IMileageCounter.cs" />
- <Compile Include="Utils\DebugData.cs" />
- <Compile Include="Models\Simulation\Impl\DistanceRun.cs" />
- <Compile Include="Models\Simulation\Impl\PowertrainBuilder.cs" />
- <Compile Include="Models\Simulation\Impl\TimeRun.cs" />
- <Compile Include="OutputData\DeclarationReport.cs" />
- <Compile Include="OutputData\FileIO\FileOutputWriter.cs" />
- <Compile Include="OutputData\IModalDataContainer.cs" />
- <Compile Include="OutputData\IDataWriter.cs" />
- <Compile Include="OutputData\ModalDataContainer.cs" />
- <Compile Include="OutputData\SummaryDataContainer.cs" />
- <Compile Include="Properties\Version.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Version.tt</DependentUpon>
- </Compile>
- <Compile Include="JsonKeys.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>JsonKeys.resx</DependentUpon>
- </Compile>
- <Compile Include="Utils\DataTableExtensionMethods.cs" />
- <Compile Include="Utils\DateTimeFallbackDeserializer.cs" />
- <Compile Include="Utils\DictionaryExtensionMethods.cs" />
- <Compile Include="Utils\IterationStatistics.cs" />
- <Compile Include="Utils\RessourceHelper.cs" />
- <Compile Include="Models\Declaration\Segment.cs" />
- <Compile Include="Models\Declaration\Axle.cs" />
- <Compile Include="Models\SimulationComponent\Data\CombustionEngineData.cs" />
- <Compile Include="Models\SimulationComponent\Data\DrivingCycleData.cs" />
- <Compile Include="Models\SimulationComponent\Data\Engine\FuelConsumptionMap.cs" />
- <Compile Include="Models\SimulationComponent\Data\Engine\EngineFullLoadCurve.cs" />
- <Compile Include="Models\SimulationComponent\Data\GearboxData.cs" />
- <Compile Include="Models\SimulationComponent\Data\Gearbox\GearData.cs" />
- <Compile Include="Models\SimulationComponent\Data\Gearbox\TransmissionLossMap.cs" />
- <Compile Include="Models\SimulationComponent\Data\Gearbox\ShiftPolygon.cs" />
- <Compile Include="Models\SimulationComponent\Data\Gearbox\TorqueConverterData.cs" />
- <Compile Include="Models\SimulationComponent\Data\RetarderData.cs" />
- <Compile Include="Models\SimulationComponent\Data\RetarderLossMap.cs" />
- <Compile Include="Models\SimulationComponent\Data\VehicleData.cs" />
- <Compile Include="Models\SimulationComponent\IClutch.cs" />
- <Compile Include="Models\SimulationComponent\IDrivingCycle.cs" />
- <Compile Include="Models\SimulationComponent\IDriver.cs" />
- <Compile Include="Models\SimulationComponent\Impl\Vehicle.cs" />
- <Compile Include="Models\SimulationComponent\IVehicle.cs" />
- <Compile Include="Models\SimulationComponent\Impl\Clutch.cs" />
- <Compile Include="Models\SimulationComponent\Impl\AxleGear.cs" />
- <Compile Include="Models\SimulationComponent\Impl\Retarder.cs" />
- <Compile Include="Models\SimulationComponent\IPowerTrainComponent.cs" />
- <Compile Include="Models\Simulation\Data\VectoRunData.cs" />
- <Compile Include="Models\SimulationComponent\Impl\Driver.cs" />
- <Compile Include="Utils\Formulas.cs" />
- <Compile Include="Utils\Physics.cs" />
- <Compile Include="Utils\SearchAlgorithm.cs" />
- <Compile Include="Models\SimulationComponent\Data\SimulationComponentData.cs" />
- <Compile Include="Models\SimulationComponent\ICombustionEngine.cs" />
- <Compile Include="Models\SimulationComponent\IGearbox.cs" />
- <Compile Include="Models\Connector\Ports\ISimulationPort.cs" />
- <Compile Include="Models\SimulationComponent\Impl\DistanceBasedDrivingCycle.cs" />
- <Compile Include="Models\SimulationComponent\Impl\CombustionEngine.cs" />
- <Compile Include="Models\SimulationComponent\Impl\Gearbox.cs" />
- <Compile Include="Models\SimulationComponent\Impl\Wheels.cs" />
- <Compile Include="Models\SimulationComponent\IWheels.cs" />
- <Compile Include="Models\SimulationComponent\VectoSimulationComponent.cs" />
- <Compile Include="Models\SimulationComponent\Impl\PowertrainDrivingCycle.cs" />
- <Compile Include="Models\Simulation\Data\ModalResult.cs" />
- <Compile Include="Models\Simulation\IVectoRun.cs" />
- <Compile Include="Models\Simulation\Impl\SimulatorFactory.cs" />
- <Compile Include="Models\Simulation\Impl\VectoRun.cs" />
- <Compile Include="Models\Simulation\Impl\JobContainer.cs" />
- <Compile Include="Models\Simulation\Impl\VehicleContainer.cs" />
- <Compile Include="Models\Simulation\DataBus\IDataBus.cs" />
- <Compile Include="Models\Simulation\DataBus\IEngineInfo.cs" />
- <Compile Include="Models\Simulation\DataBus\IGearboxInfo.cs" />
- <Compile Include="Models\Simulation\DataBus\IVehicleInfo.cs" />
- <Compile Include="Models\Simulation\IVehicleContainer.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="OutputData\FileIO\ShiftPolygonExport.cs" />
- <Compile Include="Utils\SwitchExtension.cs" />
- <Compile Include="Utils\VectoCSVFile.cs" />
- <Compile Include="Utils\DelaunayMap.cs" />
- <Compile Include="Utils\VectoVersionCore.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>VectoVersionCore.tt</DependentUpon>
- </Compile>
- <Compile Include="Utils\XmlResourceResolver.cs" />
- <Compile Include="Utils\XMLValidator.cs" />
- <Compile Include="Utils\XPathHelper.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="app.config" />
- <None Include="packages.config" />
- <EmbeddedResource Include="JsonKeys.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>JsonKeys.Designer.cs</LastGenOutput>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\Declaration\Wheels.csv" />
- <EmbeddedResource Include="Resources\Declaration\SegmentTable.csv" />
- <EmbeddedResource Include="Resources\Declaration\MissionCycles\HeavyUrban.vdri" />
- <EmbeddedResource Include="Resources\Declaration\MissionCycles\Suburban.vdri" />
- <EmbeddedResource Include="Resources\Declaration\MissionCycles\Urban.vdri" />
- <EmbeddedResource Include="Resources\Declaration\MissionCycles\Coach.vdri" />
- <EmbeddedResource Include="Resources\Declaration\MissionCycles\Construction.vdri" />
- <EmbeddedResource Include="Resources\Declaration\MissionCycles\Interurban.vdri" />
- <EmbeddedResource Include="Resources\Declaration\MissionCycles\LongHaul.vdri" />
- <EmbeddedResource Include="Resources\Declaration\MissionCycles\MunicipalUtility.vdri" />
- <EmbeddedResource Include="Resources\Declaration\MissionCycles\RegionalDelivery.vdri" />
- <EmbeddedResource Include="Resources\Declaration\MissionCycles\UrbanDelivery.vdri" />
- <EmbeddedResource Include="Resources\Declaration\PT1.csv" />
- <EmbeddedResource Include="Resources\Declaration\VACC\Truck.vacc" />
- <EmbeddedResource Include="Resources\Declaration\VAUX\ES-Tech.csv" />
- <EmbeddedResource Include="Resources\Declaration\VAUX\Fan-Tech.csv" />
- <EmbeddedResource Include="Resources\Declaration\VAUX\HVAC-Table.csv" />
- <EmbeddedResource Include="Resources\Declaration\VAUX\PS-Table.csv" />
- <EmbeddedResource Include="Resources\Declaration\VAUX\SP-Table.csv" />
- <EmbeddedResource Include="Resources\Declaration\VAUX\SP-Tech.csv" />
- <EmbeddedResource Include="Resources\Declaration\VCDV\VCDV_parameters.csv" />
- <EmbeddedResource Include="Resources\Declaration\WHTC-Weighting-Factors.csv" />
- <EmbeddedResource Include="Resources\Declaration\VAUX\ALT-Tech.csv" />
- <EmbeddedResource Include="Resources\Declaration\Report\cyclePageTemplate.pdf" />
- <EmbeddedResource Include="Resources\Declaration\Report\title2CyclesTemplate.pdf" />
- <EmbeddedResource Include="Resources\Declaration\Report\title3CyclesTemplate.pdf" />
- <None Include="Properties\Version.tt">
- <Generator>TextTemplatingFileGenerator</Generator>
- <LastGenOutput>Version.cs</LastGenOutput>
- </None>
- <EmbeddedResource Include="Resources\Declaration\LAC-DF-Vdrop.csv" />
- <EmbeddedResource Include="Resources\Declaration\LAC-DF-Vtarget.csv" />
- <EmbeddedResource Include="Resources\Declaration\Body_Trailers_Weights.csv" />
- <EmbeddedResource Include="Resources\Declaration\Payloads.csv" />
- <EmbeddedResource Include="Resources\Declaration\VAUX\SP-Axles.csv" />
- <EmbeddedResource Include="Resources\Declaration\VAUX\PTO-tech.csv" />
- <EmbeddedResource Include="Resources\Declaration\TorqueConverter.csv" />
- <EmbeddedResource Include="Resources\XSD\ParameterDocumentation.xsd">
- <SubType>Designer</SubType>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoComponent.xsd">
- <SubType>Designer</SubType>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoEngineeringDefinitions.0.6.xsd">
- <SubType>Designer</SubType>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoEngineeringDefinitions.0.7.xsd">
- <SubType>Designer</SubType>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoEngineeringInput.xsd">
- <SubType>Designer</SubType>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoInput.xsd">
- <SubType>Designer</SubType>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoOutputManufacturer.xsd">
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\xmldsig-core-schema.xsd">
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\Declaration\MissionCycles\MunicipalUtility_PTO_generic.vptoc" />
- <EmbeddedResource Include="Resources\Declaration\MissionCycles\MunicipalUtility_PTO_generic.vptol" />
- <EmbeddedResource Include="Resources\Declaration\FuelTypes.csv" />
- <EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.1.0.xsd">
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoOutputCustomer.xsd">
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoInput.1.0.xsd">
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoOutputCustomer.0.4.xsd">
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoOutputManufacturer.0.4.xsd">
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoEngineeringInput.0.7.xsd">
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoComponent.1.0.xsd">
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoOutputManufacturer.0.5.xsd">
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoOutputCustomer.0.5.xsd">
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <None Include="Utils\VectoVersionCore.tt">
- <Generator>TextTemplatingFileGenerator</Generator>
- <LastGenOutput>VectoVersionCore.cs</LastGenOutput>
- </None>
- <None Include="VersionNumber.t4">
- <Generator>TextTemplatingFileGenerator</Generator>
- <LastGenOutput>VersionNumber1.cs</LastGenOutput>
- </None>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\Declaration\Report\4x2r.png" />
- <EmbeddedResource Include="Resources\Declaration\Report\4x2rt.png" />
- <EmbeddedResource Include="Resources\Declaration\Report\4x2tt.png" />
- <EmbeddedResource Include="Resources\Declaration\Report\6x2r.png" />
- <EmbeddedResource Include="Resources\Declaration\Report\6x2rt.png" />
- <EmbeddedResource Include="Resources\Declaration\Report\6x2tt.png" />
- <EmbeddedResource Include="Resources\Declaration\Report\Undef.png" />
- </ItemGroup>
- <ItemGroup>
- <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\VectoCommon\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
- <Project>{b4b9bd2f-fd8f-4bb8-82fa-e2154d2c7fbd}</Project>
- <Name>AdvancedAuxiliaryInterfaces</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\VECTOAux\VectoAuxiliaries\VectoAuxiliaries.vbproj">
- <Project>{fdeee460-0b8a-4ef6-8d9e-72f203a50f65}</Project>
- <Name>VectoAuxiliaries</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\VectoCommon\VectoCommon\VectoCommon.csproj">
- <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project>
- <Name>VectoCommon</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\VectoCommon\VectoHashing\VectoHashing.csproj">
- <Project>{B673E12F-D323-4C4C-8805-9915B2C72D3D}</Project>
- <Name>VectoHashing</Name>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
- <Import Project="$(SolutionDir)Build\TextPreProcessing.targets" />
-</Project>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/VersionNumber.t4 b/VectoCore/VectoCore/VersionNumber.t4
index c2a37907d6ca63b1214c55dcda6aa212459e0e25..78d4e8ed1d7eb99bf028d07419c2b15a65db101d 100644
--- a/VectoCore/VectoCore/VersionNumber.t4
+++ b/VectoCore/VectoCore/VersionNumber.t4
@@ -6,6 +6,6 @@ int GetBuildNumber()
string GetVectoCoreVersionNumber()
{
- return "3.2.1." + GetBuildNumber();
+ return "3.3.0." + GetBuildNumber();
}
#>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs b/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
index f20843f544a5f6d09188c9cf5810b8a0ae244787..033f3e329aec7e9ff92016d7dcf41d2e2ed3f795 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
@@ -1,4 +1,35 @@
-using System.Data;
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2017 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
+*/
+
+using System.Data;
using System.IO;
using System.Linq;
using System.Xml;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/VTPCycleValidationTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/VTPCycleValidationTest.cs
index 2a4cad939cb7c101fb90de20bcd8d27ff274d0f7..3d0d1fd2679830b04e957893eb45905b4ddd1b37 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/VTPCycleValidationTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/VTPCycleValidationTest.cs
@@ -1,4 +1,35 @@
-using System.Collections.Generic;
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2017 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
+*/
+
+using System.Collections.Generic;
using System.Linq;
using NLog;
using NLog.Config;