diff --git a/.gitignore b/.gitignore index 72796d4a54028f06a6353940ef47c94715dda9fb..5c7bd518bee30740c968df6c1320ba57d67d563c 100644 --- a/.gitignore +++ b/.gitignore @@ -221,3 +221,4 @@ Documentation/VehiclesReleaseComparisonDeclarationMode/**/*.vsum /VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/output /Vecto3GUI2020Test/TestData/output /VectoCommon/VectoCommon/InputData/BusInputData.cd +/.idea/.idea.VECTO/.idea diff --git a/Directory.Build.targets b/Directory.Build.targets index adb0bbe5ce19a05275019ed062324e91848e840d..5888f23e743aa10da43dccae2fc659ed157289c8 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -7,9 +7,12 @@ <Exec Command=""$(solutiondir)documentation\VectoHashingTool\convert.bat"" WorkingDirectory="$(solutiondir)documentation\VectoHashingTool"/> </Target> --> + <!--<Target Name="BeforeBuild"> + <Message Text="Compiling the program in $(Configuration) Configuration" Importance="high" /> + </Target>--> - <Target Name="AfterBuild" Condition="'$(Configuration)'=='Deploy'"> - + <Target Name="AfterBuild" Condition="('$(Configuration)'=='Deploy') Or ('$(Configuration)' == 'MockupDeploy')"> + <Message Text="Packaging in $(Configuration) Configuration" Importance="high" /> <Exec Command="cscript "$(SolutionDir)documentation\user manual source\convertpptxtopdf.vbs" "$(SolutionDir)documentation\user manual source\release notes vecto3.x.pptx" "$(SolutionDir)documentation\user manual source\release notes vecto3.x.pdf""/> <PropertyGroup> <CurrentDate>$([System.DateTime]::Now.ToString(yyy_MM_dd))</CurrentDate> @@ -18,7 +21,8 @@ <RemoveDir Directories="$(SolutionDir)Deploy" Condition="Exists('$(SolutionDir)Deploy')"/> <MakeDir Directories="$(DeployPath)"/> - <ItemGroup> + + <ItemGroup Condition="'$(Configuration)'=='Deploy'"> <!-- All files for net45 --> <Net45VECTO Include="$(SolutionDir)VECTO\bin\Release\net45\*.exe*"/> <Net45VECTO Include="$(SolutionDir)VECTO\bin\Release\net45\*.dll*"/> @@ -29,11 +33,27 @@ <Net45VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net45\*.exe*"/> <Net45VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net45\*.dll*"/> </ItemGroup> + <!--MockupDeploy--> + + <ItemGroup Condition="'$(Configuration)'=='MockupDeploy'"> + <!-- All files for net45 --> + <Net45VECTO Include="$(SolutionDir)VECTO\bin\MockupRelease\net45\*.exe*"/> + <Net45VECTO Include="$(SolutionDir)VECTO\bin\MockupRelease\net45\*.dll*"/> + <Net45HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net45\*.exe*"/> + <Net45HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net45\*.dll*"/> + <Net45HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net45\*.exe*"/> + <Net45HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net45\*.dll*"/> + <Net45VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\MockupRelease\net45\*.exe*"/> + <Net45VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\MockupRelease\net45\*.dll*"/> + </ItemGroup> + + <Copy SourceFiles="@(Net45VectoCommandLine)" DestinationFolder="$(DeployPath)net45"/> <Copy SourceFiles="@(Net45HashingTool)" DestinationFolder="$(DeployPath)net45"/> <Copy SourceFiles="@(Net45VECTO)" DestinationFolder="$(DeployPath)net45"/> - <ItemGroup> + + <ItemGroup Condition="'$(Configuration)'=='Deploy'"> <!-- All files for net48 --> <Net48VECTO Include="$(SolutionDir)VECTO\bin\Release\net48\*.exe*"/> <Net48VECTO Include="$(SolutionDir)VECTO\bin\Release\net48\*.dll*"/> @@ -44,12 +64,26 @@ <Net48VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net48\*.exe*"/> <Net48VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net48\*.dll*"/> </ItemGroup> + + <!--MockupDeploy--> + <ItemGroup Condition="'$(Configuration)'=='MockupDeploy'"> + <!-- All files for net48 --> + <Net48VECTO Include="$(SolutionDir)VECTO\bin\MockupRelease\net48\*.exe*" /> + <Net48VECTO Include="$(SolutionDir)VECTO\bin\MockupRelease\net48\*.dll*" /> + <Net48HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net48\*.exe*" /> + <Net48HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net48\*.dll*" /> + <Net48VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\MockupRelease\net48\*.exe*" /> + <Net48VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\MockupRelease\net48\*.dll*" /> + <Net48VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\MockupRelease\net48\*.exe*" /> + <Net48VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\MockupRelease\net48\*.dll*" /> + </ItemGroup> + <Copy SourceFiles="@(Net48VectoCommandLine)" DestinationFolder="$(DeployPath)net48"/> <Copy SourceFiles="@(Net48HashingTool)" DestinationFolder="$(DeployPath)net48"/> <Copy SourceFiles="@(Net48VectoMultistage)" DestinationFolder="$(DeployPath)net48"/> <Copy SourceFiles="@(Net48VECTO)" DestinationFolder="$(DeployPath)net48"/> - <ItemGroup> + <ItemGroup Condition="'$(Configuration)'=='Deploy'"> <!-- All files for net6.0 --> <Vecto Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\VECTO.*" Exclude="*.dev.json"/> <Vecto Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\*.dll"/> @@ -64,6 +98,24 @@ <VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net6.0-windows\*.dll"/> <VectoMultistageRuntimes Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net6.0-windows\runtimes\**\*.*"/> </ItemGroup> + <!--MockupDeploy--> + + <ItemGroup Condition="'$(Configuration)'=='MockupDeploy'"> + <!-- All files for net6.0 --> + <Vecto Include="$(SolutionDir)VECTO\bin\MockupRelease\net6.0-windows\VECTO.*" Exclude="*.dev.json"/> + <Vecto Include="$(SolutionDir)VECTO\bin\MockupRelease\net6.0-windows\*.dll"/> + <VectoRuntimes Include="$(SolutionDir)VECTO\bin\MockupRelease\net6.0-windows\runtimes\**\*.*"/> + <VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\MockupRelease\net6.0\vectocmd.*" Exclude="*.dev.json"/> + <VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\MockupRelease\net6.0\*.dll"/> + <VectoCommandLineRuntimes Include="$(SolutionDir)VectoConsole\bin\MockupRelease\net6.0\runtimes\**\*.*"/> + <HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\hashingcmd.*" Exclude="*.dev.json"/> + <HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\*.dll"/> + <HashingToolRuntimes Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\runtimes\**\*.*"/> + <VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\MockupRelease\net6.0-windows\VECTOMultistage.*" Exclude="*.dev.json"/> + <VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\MockupRelease\net6.0-windows\*.dll"/> + <VectoMultistageRuntimes Include="$(SolutionDir)VECTO3GUI2020\bin\MockupRelease\net6.0-windows\runtimes\**\*.*"/> + </ItemGroup> + <Copy SourceFiles="@(HashingTool)" DestinationFolder="$(DeployPath)net60"/> <Copy SourceFiles="@(VectoMultistage)" DestinationFolder="$(DeployPath)net60"/> <Copy SourceFiles="@(VectoCommandLine)" DestinationFolder="$(DeployPath)net60"/> diff --git a/Tools/VECTOConsoleStart/Program.cs b/Tools/VECTOConsoleStart/Program.cs index 4ee38c806d52ec7f2ee2e774945c926e400537ee..1fd271eeacb671396da496e84940b00385d92c18 100644 --- a/Tools/VECTOConsoleStart/Program.cs +++ b/Tools/VECTOConsoleStart/Program.cs @@ -3,17 +3,30 @@ using Microsoft.Win32; using System.Diagnostics; using System.Reflection; using System.IO; +using System.Linq; +using System.Text; namespace TUGraz.VECTO { class Program { - static void Main() + private static int Main(string[] args) { var version = GetHighestNETVersion(); - Process.Start(new ProcessStartInfo($"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe") { - WorkingDirectory = Directory.GetCurrentDirectory() + + var argsString = ""; + foreach (var arg in args) { + argsString += $"\"{arg}\" "; + } + + var process = Process.Start(new ProcessStartInfo($"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe") + { + WorkingDirectory = Directory.GetCurrentDirectory(), + UseShellExecute = false, + Arguments = argsString, }); + process?.WaitForExit(); + return process?.ExitCode ?? -1; } private static string GetHighestNETVersion() diff --git a/Tools/VECTOConsoleStart/VECTOConsoleStart.csproj b/Tools/VECTOConsoleStart/VECTOConsoleStart.csproj index eb31dee287a0b3b2fdcfb7d6069dfdfbde1f7296..0fb874df0422f1f62e7efe4260761f8bcb872408 100644 --- a/Tools/VECTOConsoleStart/VECTOConsoleStart.csproj +++ b/Tools/VECTOConsoleStart/VECTOConsoleStart.csproj @@ -1,12 +1,14 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <OutputType>WinExe</OutputType> + <OutputType>exe</OutputType> + <AssemblyName>vectocmd</AssemblyName> <ApplicationIcon>Icon2.ico</ApplicationIcon> <RootNamespace>TUGraz.VECTO</RootNamespace> <TargetFrameworks>net45</TargetFrameworks> - <DefineConstants /> + <DefineConstants /> + <StartupObject></StartupObject> </PropertyGroup> </Project> diff --git a/Tools/VECTOStart/VECTOStart.csproj b/Tools/VECTOStart/VECTOStart.csproj index c4cdcdedd451f9f16406bf197f3157ce195d5910..e9acb813b89388870fd164362beebd56aa59d7e7 100644 --- a/Tools/VECTOStart/VECTOStart.csproj +++ b/Tools/VECTOStart/VECTOStart.csproj @@ -5,7 +5,7 @@ <AssemblyName>VECTO</AssemblyName> <ApplicationIcon>Icon2.ico</ApplicationIcon> <RootNamespace>TUGraz.VECTO</RootNamespace> - <Configurations>Debug;Release;Deploy</Configurations> + <Configurations>Debug;Release;Deploy;MockupDeploy</Configurations> <TargetFrameworks>net45</TargetFrameworks> <DefineConstants /> </PropertyGroup> diff --git a/VECTO.sln b/VECTO.sln index 774eb7bb438460e7e6041c5777a0a01250975b2f..eb7e1c1731659830eae22b068c577fa022769153 100644 --- a/VECTO.sln +++ b/VECTO.sln @@ -112,7 +112,9 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Deploy|Any CPU = Deploy|Any CPU - Mockup|Any CPU = Mockup|Any CPU + MockupDebug|Any CPU = MockupDebug|Any CPU + MockupDeploy|Any CPU = MockupDeploy|Any CPU + MockupRelease|Any CPU = MockupRelease|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution @@ -120,207 +122,290 @@ Global {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Debug|Any CPU.Build.0 = Debug|Any CPU {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Deploy|Any CPU.ActiveCfg = Release|Any CPU {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Deploy|Any CPU.Build.0 = Release|Any CPU - {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Mockup|Any CPU.ActiveCfg = MockupDebug|Any CPU - {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Mockup|Any CPU.Build.0 = MockupDebug|Any CPU + {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU + {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU + {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.MockupDeploy|Any CPU.ActiveCfg = MockupRelease|Any CPU + {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.MockupDeploy|Any CPU.Build.0 = MockupRelease|Any CPU + {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.MockupRelease|Any CPU.ActiveCfg = MockupRelease|Any CPU + {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.MockupRelease|Any CPU.Build.0 = MockupRelease|Any CPU {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Release|Any CPU.ActiveCfg = Release|Any CPU {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Release|Any CPU.Build.0 = Release|Any CPU {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Debug|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}.Mockup|Any CPU.ActiveCfg = MockupDebug|Any CPU - {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Mockup|Any CPU.Build.0 = MockupDebug|Any CPU + {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU + {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU + {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.MockupDeploy|Any CPU.ActiveCfg = MockupRelease|Any CPU + {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.MockupDeploy|Any CPU.Build.0 = MockupRelease|Any CPU + {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.MockupRelease|Any CPU.ActiveCfg = MockupRelease|Any CPU + {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.MockupRelease|Any CPU.Build.0 = MockupRelease|Any CPU {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Release|Any CPU.ActiveCfg = Release|Any CPU {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Release|Any CPU.Build.0 = Release|Any CPU {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Debug|Any CPU.Build.0 = Debug|Any CPU {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU + {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.MockupRelease|Any CPU.Build.0 = Release|Any CPU {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Release|Any CPU.ActiveCfg = Release|Any CPU {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Release|Any CPU.Build.0 = Release|Any CPU {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Debug|Any CPU.Build.0 = Debug|Any CPU {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Mockup|Any CPU.ActiveCfg = MockupDebug|Any CPU - {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Mockup|Any CPU.Build.0 = MockupDebug|Any CPU + {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU + {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU + {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU + {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.MockupRelease|Any CPU.Build.0 = Release|Any CPU {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Release|Any CPU.ActiveCfg = Release|Any CPU {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Release|Any CPU.Build.0 = Release|Any CPU {60AD4DF0-6648-4374-83CB-C7A162EFB391}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {60AD4DF0-6648-4374-83CB-C7A162EFB391}.Debug|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}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {60AD4DF0-6648-4374-83CB-C7A162EFB391}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {60AD4DF0-6648-4374-83CB-C7A162EFB391}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU + {60AD4DF0-6648-4374-83CB-C7A162EFB391}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU + {60AD4DF0-6648-4374-83CB-C7A162EFB391}.MockupDeploy|Any CPU.ActiveCfg = MockupRelease|Any CPU + {60AD4DF0-6648-4374-83CB-C7A162EFB391}.MockupDeploy|Any CPU.Build.0 = MockupRelease|Any CPU + {60AD4DF0-6648-4374-83CB-C7A162EFB391}.MockupRelease|Any CPU.ActiveCfg = Debug|Any CPU + {60AD4DF0-6648-4374-83CB-C7A162EFB391}.MockupRelease|Any CPU.Build.0 = Debug|Any CPU {60AD4DF0-6648-4374-83CB-C7A162EFB391}.Release|Any CPU.ActiveCfg = Release|Any CPU {60AD4DF0-6648-4374-83CB-C7A162EFB391}.Release|Any CPU.Build.0 = Release|Any CPU {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Debug|Any CPU.Build.0 = Debug|Any CPU {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Release|Any CPU.ActiveCfg = Release|Any CPU {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Release|Any CPU.Build.0 = Release|Any CPU {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Debug|Any CPU.Build.0 = Debug|Any CPU {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Release|Any CPU.ActiveCfg = Release|Any CPU {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Release|Any CPU.Build.0 = Release|Any CPU {E8B0B447-1A54-4BEC-A160-AF0017000781}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E8B0B447-1A54-4BEC-A160-AF0017000781}.Debug|Any CPU.Build.0 = Debug|Any CPU {E8B0B447-1A54-4BEC-A160-AF0017000781}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {E8B0B447-1A54-4BEC-A160-AF0017000781}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {E8B0B447-1A54-4BEC-A160-AF0017000781}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {E8B0B447-1A54-4BEC-A160-AF0017000781}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {E8B0B447-1A54-4BEC-A160-AF0017000781}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {E8B0B447-1A54-4BEC-A160-AF0017000781}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {E8B0B447-1A54-4BEC-A160-AF0017000781}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU {E8B0B447-1A54-4BEC-A160-AF0017000781}.Release|Any CPU.ActiveCfg = Release|Any CPU {E8B0B447-1A54-4BEC-A160-AF0017000781}.Release|Any CPU.Build.0 = Release|Any CPU {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Debug|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}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.MockupDeploy|Any CPU.Build.0 = Release|Any CPU + {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU + {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.MockupRelease|Any CPU.Build.0 = Release|Any CPU {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Release|Any CPU.ActiveCfg = Release|Any CPU {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Release|Any CPU.Build.0 = Release|Any CPU {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Release|Any CPU.Build.0 = Release|Any CPU {7C364099-9B85-473A-8A42-BBEBE4798FF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7C364099-9B85-473A-8A42-BBEBE4798FF5}.Debug|Any CPU.Build.0 = Debug|Any CPU {7C364099-9B85-473A-8A42-BBEBE4798FF5}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {7C364099-9B85-473A-8A42-BBEBE4798FF5}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {7C364099-9B85-473A-8A42-BBEBE4798FF5}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {7C364099-9B85-473A-8A42-BBEBE4798FF5}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {7C364099-9B85-473A-8A42-BBEBE4798FF5}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {7C364099-9B85-473A-8A42-BBEBE4798FF5}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {7C364099-9B85-473A-8A42-BBEBE4798FF5}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU + {7C364099-9B85-473A-8A42-BBEBE4798FF5}.MockupRelease|Any CPU.Build.0 = Release|Any CPU {7C364099-9B85-473A-8A42-BBEBE4798FF5}.Release|Any CPU.ActiveCfg = Release|Any CPU {7C364099-9B85-473A-8A42-BBEBE4798FF5}.Release|Any CPU.Build.0 = Release|Any CPU {B673E12F-D323-4C4C-8805-9915B2C72D3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B673E12F-D323-4C4C-8805-9915B2C72D3D}.Debug|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}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {B673E12F-D323-4C4C-8805-9915B2C72D3D}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {B673E12F-D323-4C4C-8805-9915B2C72D3D}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {B673E12F-D323-4C4C-8805-9915B2C72D3D}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {B673E12F-D323-4C4C-8805-9915B2C72D3D}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {B673E12F-D323-4C4C-8805-9915B2C72D3D}.MockupDeploy|Any CPU.Build.0 = Release|Any CPU + {B673E12F-D323-4C4C-8805-9915B2C72D3D}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU + {B673E12F-D323-4C4C-8805-9915B2C72D3D}.MockupRelease|Any CPU.Build.0 = Release|Any CPU {B673E12F-D323-4C4C-8805-9915B2C72D3D}.Release|Any CPU.ActiveCfg = Release|Any CPU {B673E12F-D323-4C4C-8805-9915B2C72D3D}.Release|Any CPU.Build.0 = Release|Any CPU {760C1C5B-A767-463E-BA85-F0BCFC23A550}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {760C1C5B-A767-463E-BA85-F0BCFC23A550}.Debug|Any CPU.Build.0 = Debug|Any CPU {760C1C5B-A767-463E-BA85-F0BCFC23A550}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {760C1C5B-A767-463E-BA85-F0BCFC23A550}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {760C1C5B-A767-463E-BA85-F0BCFC23A550}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {760C1C5B-A767-463E-BA85-F0BCFC23A550}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {760C1C5B-A767-463E-BA85-F0BCFC23A550}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {760C1C5B-A767-463E-BA85-F0BCFC23A550}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {760C1C5B-A767-463E-BA85-F0BCFC23A550}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU {760C1C5B-A767-463E-BA85-F0BCFC23A550}.Release|Any CPU.ActiveCfg = Release|Any CPU {760C1C5B-A767-463E-BA85-F0BCFC23A550}.Release|Any CPU.Build.0 = Release|Any CPU {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Debug|Any CPU.Build.0 = Debug|Any CPU {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|Any CPU.ActiveCfg = Release|Any CPU {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|Any CPU.Build.0 = Release|Any CPU - {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.MockupDeploy|Any CPU.Build.0 = Release|Any CPU + {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU + {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.MockupRelease|Any CPU.Build.0 = Release|Any CPU {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Release|Any CPU.ActiveCfg = Release|Any CPU {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Release|Any CPU.Build.0 = Release|Any CPU {33F9848E-9257-4BE2-915F-68E748AEB204}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {33F9848E-9257-4BE2-915F-68E748AEB204}.Debug|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}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {33F9848E-9257-4BE2-915F-68E748AEB204}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {33F9848E-9257-4BE2-915F-68E748AEB204}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {33F9848E-9257-4BE2-915F-68E748AEB204}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {33F9848E-9257-4BE2-915F-68E748AEB204}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {33F9848E-9257-4BE2-915F-68E748AEB204}.MockupDeploy|Any CPU.Build.0 = Release|Any CPU + {33F9848E-9257-4BE2-915F-68E748AEB204}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU + {33F9848E-9257-4BE2-915F-68E748AEB204}.MockupRelease|Any CPU.Build.0 = Release|Any CPU {33F9848E-9257-4BE2-915F-68E748AEB204}.Release|Any CPU.ActiveCfg = Release|Any CPU {33F9848E-9257-4BE2-915F-68E748AEB204}.Release|Any CPU.Build.0 = Release|Any CPU {7E9172D4-07E3-4077-814E-7117AB2B3E22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7E9172D4-07E3-4077-814E-7117AB2B3E22}.Debug|Any CPU.Build.0 = Debug|Any CPU {7E9172D4-07E3-4077-814E-7117AB2B3E22}.Deploy|Any CPU.ActiveCfg = Release|Any CPU {7E9172D4-07E3-4077-814E-7117AB2B3E22}.Deploy|Any CPU.Build.0 = Release|Any CPU - {7E9172D4-07E3-4077-814E-7117AB2B3E22}.Mockup|Any CPU.ActiveCfg = MockupDebug|Any CPU - {7E9172D4-07E3-4077-814E-7117AB2B3E22}.Mockup|Any CPU.Build.0 = MockupDebug|Any CPU + {7E9172D4-07E3-4077-814E-7117AB2B3E22}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU + {7E9172D4-07E3-4077-814E-7117AB2B3E22}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU + {7E9172D4-07E3-4077-814E-7117AB2B3E22}.MockupDeploy|Any CPU.ActiveCfg = MockupRelease|Any CPU + {7E9172D4-07E3-4077-814E-7117AB2B3E22}.MockupDeploy|Any CPU.Build.0 = MockupRelease|Any CPU + {7E9172D4-07E3-4077-814E-7117AB2B3E22}.MockupRelease|Any CPU.ActiveCfg = MockupRelease|Any CPU + {7E9172D4-07E3-4077-814E-7117AB2B3E22}.MockupRelease|Any CPU.Build.0 = MockupRelease|Any CPU {7E9172D4-07E3-4077-814E-7117AB2B3E22}.Release|Any CPU.ActiveCfg = Release|Any CPU {7E9172D4-07E3-4077-814E-7117AB2B3E22}.Release|Any CPU.Build.0 = Release|Any CPU {7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Debug|Any CPU.Build.0 = Debug|Any CPU {7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU {7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Release|Any CPU.ActiveCfg = Release|Any CPU {7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Release|Any CPU.Build.0 = Release|Any CPU {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.Debug|Any CPU.Build.0 = Debug|Any CPU {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.Deploy|Any CPU.ActiveCfg = Release|Any CPU {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.Deploy|Any CPU.Build.0 = Release|Any CPU - {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.MockupDeploy|Any CPU.Build.0 = Release|Any CPU + {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU + {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.MockupRelease|Any CPU.Build.0 = Release|Any CPU {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.Release|Any CPU.ActiveCfg = Release|Any CPU {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.Release|Any CPU.Build.0 = Release|Any CPU {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.Debug|Any CPU.Build.0 = Debug|Any CPU {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.Deploy|Any CPU.ActiveCfg = Release|Any CPU {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.Deploy|Any CPU.Build.0 = Release|Any CPU - {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.Release|Any CPU.ActiveCfg = Release|Any CPU {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.Release|Any CPU.Build.0 = Release|Any CPU {165739A9-C28D-4B82-96A9-8D063BEC22B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {165739A9-C28D-4B82-96A9-8D063BEC22B9}.Debug|Any CPU.Build.0 = Debug|Any CPU {165739A9-C28D-4B82-96A9-8D063BEC22B9}.Deploy|Any CPU.ActiveCfg = Release|Any CPU {165739A9-C28D-4B82-96A9-8D063BEC22B9}.Deploy|Any CPU.Build.0 = Release|Any CPU - {165739A9-C28D-4B82-96A9-8D063BEC22B9}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {165739A9-C28D-4B82-96A9-8D063BEC22B9}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {165739A9-C28D-4B82-96A9-8D063BEC22B9}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {165739A9-C28D-4B82-96A9-8D063BEC22B9}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {165739A9-C28D-4B82-96A9-8D063BEC22B9}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {165739A9-C28D-4B82-96A9-8D063BEC22B9}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU {165739A9-C28D-4B82-96A9-8D063BEC22B9}.Release|Any CPU.ActiveCfg = Release|Any CPU {165739A9-C28D-4B82-96A9-8D063BEC22B9}.Release|Any CPU.Build.0 = Release|Any CPU {D47DF5C7-CD92-4388-A18F-1620630DB437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D47DF5C7-CD92-4388-A18F-1620630DB437}.Debug|Any CPU.Build.0 = Debug|Any CPU {D47DF5C7-CD92-4388-A18F-1620630DB437}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU {D47DF5C7-CD92-4388-A18F-1620630DB437}.Deploy|Any CPU.Build.0 = Deploy|Any CPU - {D47DF5C7-CD92-4388-A18F-1620630DB437}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {D47DF5C7-CD92-4388-A18F-1620630DB437}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {D47DF5C7-CD92-4388-A18F-1620630DB437}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {D47DF5C7-CD92-4388-A18F-1620630DB437}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {D47DF5C7-CD92-4388-A18F-1620630DB437}.MockupDeploy|Any CPU.ActiveCfg = MockupDeploy|Any CPU + {D47DF5C7-CD92-4388-A18F-1620630DB437}.MockupDeploy|Any CPU.Build.0 = MockupDeploy|Any CPU + {D47DF5C7-CD92-4388-A18F-1620630DB437}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU + {D47DF5C7-CD92-4388-A18F-1620630DB437}.MockupRelease|Any CPU.Build.0 = Release|Any CPU {D47DF5C7-CD92-4388-A18F-1620630DB437}.Release|Any CPU.ActiveCfg = Release|Any CPU {D47DF5C7-CD92-4388-A18F-1620630DB437}.Release|Any CPU.Build.0 = Release|Any CPU {9FD67139-5120-4E64-9210-DD0A070903EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9FD67139-5120-4E64-9210-DD0A070903EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {9FD67139-5120-4E64-9210-DD0A070903EA}.Deploy|Any CPU.ActiveCfg = Release|Any CPU {9FD67139-5120-4E64-9210-DD0A070903EA}.Deploy|Any CPU.Build.0 = Release|Any CPU - {9FD67139-5120-4E64-9210-DD0A070903EA}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {9FD67139-5120-4E64-9210-DD0A070903EA}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {9FD67139-5120-4E64-9210-DD0A070903EA}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {9FD67139-5120-4E64-9210-DD0A070903EA}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {9FD67139-5120-4E64-9210-DD0A070903EA}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {9FD67139-5120-4E64-9210-DD0A070903EA}.MockupDeploy|Any CPU.Build.0 = Release|Any CPU + {9FD67139-5120-4E64-9210-DD0A070903EA}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU + {9FD67139-5120-4E64-9210-DD0A070903EA}.MockupRelease|Any CPU.Build.0 = Release|Any CPU {9FD67139-5120-4E64-9210-DD0A070903EA}.Release|Any CPU.ActiveCfg = Release|Any CPU {9FD67139-5120-4E64-9210-DD0A070903EA}.Release|Any CPU.Build.0 = Release|Any CPU {083F6B3C-9529-448F-AF1D-D0889852B918}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {083F6B3C-9529-448F-AF1D-D0889852B918}.Debug|Any CPU.Build.0 = Debug|Any CPU {083F6B3C-9529-448F-AF1D-D0889852B918}.Deploy|Any CPU.ActiveCfg = Release|Any CPU {083F6B3C-9529-448F-AF1D-D0889852B918}.Deploy|Any CPU.Build.0 = Release|Any CPU - {083F6B3C-9529-448F-AF1D-D0889852B918}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {083F6B3C-9529-448F-AF1D-D0889852B918}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {083F6B3C-9529-448F-AF1D-D0889852B918}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {083F6B3C-9529-448F-AF1D-D0889852B918}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {083F6B3C-9529-448F-AF1D-D0889852B918}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {083F6B3C-9529-448F-AF1D-D0889852B918}.MockupDeploy|Any CPU.Build.0 = Release|Any CPU + {083F6B3C-9529-448F-AF1D-D0889852B918}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU + {083F6B3C-9529-448F-AF1D-D0889852B918}.MockupRelease|Any CPU.Build.0 = Release|Any CPU {083F6B3C-9529-448F-AF1D-D0889852B918}.Release|Any CPU.ActiveCfg = Release|Any CPU {083F6B3C-9529-448F-AF1D-D0889852B918}.Release|Any CPU.Build.0 = Release|Any CPU {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.Debug|Any CPU.Build.0 = Debug|Any CPU {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.Deploy|Any CPU.ActiveCfg = Release|Any CPU {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.Deploy|Any CPU.Build.0 = Release|Any CPU - {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU - {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.Mockup|Any CPU.Build.0 = Debug|Any CPU + {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU + {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU + {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.MockupDeploy|Any CPU.Build.0 = Release|Any CPU + {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU + {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.MockupRelease|Any CPU.Build.0 = Release|Any CPU {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.Release|Any CPU.ActiveCfg = Release|Any CPU {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.Release|Any CPU.Build.0 = Release|Any CPU {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Debug|Any CPU.Build.0 = Debug|Any CPU {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Deploy|Any CPU.ActiveCfg = Release|Any CPU {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Deploy|Any CPU.Build.0 = Release|Any CPU - {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Mockup|Any CPU.ActiveCfg = MockupDebug|Any CPU - {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Mockup|Any CPU.Build.0 = MockupDebug|Any CPU + {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU + {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU + {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupDeploy|Any CPU.Build.0 = Release|Any CPU + {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU + {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupRelease|Any CPU.Build.0 = Release|Any CPU {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Release|Any CPU.ActiveCfg = Release|Any CPU {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Release|Any CPU.Build.0 = Release|Any CPU {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Debug|Any CPU.Build.0 = Debug|Any CPU {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU - {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Deploy|Any CPU.Build.0 = Debug|Any CPU - {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Mockup|Any CPU.ActiveCfg = MockupDebug|Any CPU - {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Mockup|Any CPU.Build.0 = MockupDebug|Any CPU + {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU + {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU + {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupDeploy|Any CPU.Build.0 = Release|Any CPU + {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU + {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupRelease|Any CPU.Build.0 = Release|Any CPU {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Release|Any CPU.ActiveCfg = Release|Any CPU {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Release|Any CPU.Build.0 = Release|Any CPU {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Debug|Any CPU.Build.0 = Debug|Any CPU {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU - {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Deploy|Any CPU.Build.0 = Debug|Any CPU - {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Mockup|Any CPU.ActiveCfg = MockupDebug|Any CPU - {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Mockup|Any CPU.Build.0 = MockupDebug|Any CPU + {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU + {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU + {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU + {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Release|Any CPU.ActiveCfg = Release|Any CPU {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj index 0bab292cf6261547b122610d4a88e1aedb7be002..2cd9e5dd95e017288e988ad9b2fd1272f5d8a2c0 100644 --- a/VECTO/VECTO.vbproj +++ b/VECTO/VECTO.vbproj @@ -1,115 +1,123 @@ <Project Sdk="Microsoft.NET.Sdk"> - <PropertyGroup> - <OutputType>WinExe</OutputType> - <StartupObject>Sub Main</StartupObject> - <RootNamespace>TUGraz.VECTO</RootNamespace> - <AssemblyName>VECTO</AssemblyName> - <ApplicationIcon>Resources\Icon2.ico</ApplicationIcon> - <OptionStrict>On</OptionStrict> - <UseWindowsForms>true</UseWindowsForms> - <MyType>WindowsForms</MyType> - <TargetFrameworks>net6.0-windows</TargetFrameworks> - <TargetFrameworks Condition="'$(Configuration)' == 'Release'">net45;net48;net6.0-windows</TargetFrameworks> - <DefineTrace>false</DefineTrace> - <DefineConstants /> - <Configurations>Debug;Release;MockupDebug</Configurations> - </PropertyGroup> - - <ItemGroup> - <PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> - <PackageReference Include="NLog" Version="4.7.13" /> - <PackageReference Include="Ninject" Version="3.3.5"> - <PrivateAssets>all</PrivateAssets> - </PackageReference> - </ItemGroup> + <PropertyGroup> + <OutputType>WinExe</OutputType> + <StartupObject>Sub Main</StartupObject> + <RootNamespace>TUGraz.VECTO</RootNamespace> + <AssemblyName>VECTO</AssemblyName> + <ApplicationIcon>Resources\Icon2.ico</ApplicationIcon> + <OptionStrict>On</OptionStrict> + <UseWindowsForms>true</UseWindowsForms> + <MyType>WindowsForms</MyType> + <TargetFrameworks>net6.0-windows</TargetFrameworks> + <TargetFrameworks Condition="'$(Configuration)' == 'Release'">net45;net48;net6.0-windows</TargetFrameworks> + <TargetFrameworks Condition="'$(Configuration)' == 'Deploy'">net45;net48;net6.0-windows</TargetFrameworks> + <TargetFrameworks Condition="'$(Configuration)' == 'MockupDeploy'">net45;net48;net6.0-windows</TargetFrameworks> + <DefineTrace>false</DefineTrace> + <DefineConstants /> + <Configurations>Debug;Release;MockupDebug;MockupRelease</Configurations> + </PropertyGroup> + <!--Final Define Constants https://developercommunity.visualstudio.com/t/vbprojuser-defineconstants-dont-affect/865956--> + <PropertyGroup Condition="('$(Configuration)' == 'MockupRelease') Or ('$(Configuration)' == 'MockupDebug')"> + <FinalDefineConstants>$(FinalDefineConstants),MOCKUP</FinalDefineConstants> + <DefineConstants>$(DefineConstants),MOCKUP</DefineConstants> + </PropertyGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'net45'"> - <Reference Include="System.ComponentModel.DataAnnotations" /> - <Reference Include="System.Windows.Forms.DataVisualization" /> - </ItemGroup> + <ItemGroup> + <PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> + <PackageReference Include="NLog" Version="4.7.13" /> + <PackageReference Include="Ninject" Version="3.3.6"> + <PrivateAssets>all</PrivateAssets> + </PackageReference> + </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'net48'"> - <Reference Include="System.ComponentModel.DataAnnotations" /> - <Reference Include="System.Windows.Forms.DataVisualization" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net45'"> + <Reference Include="System.ComponentModel.DataAnnotations" /> + <Reference Include="System.Windows.Forms.DataVisualization" /> + </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'"> - <PackageReference Include="System.Data.SqlClient"> - <Version>4.8.3</Version> - </PackageReference> - <PackageReference Include="System.Windows.Forms.DataVisualization"> - <Version>1.0.0-prerelease.20110.1</Version> - </PackageReference> - </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net48'"> + <Reference Include="System.ComponentModel.DataAnnotations" /> + <Reference Include="System.Windows.Forms.DataVisualization" /> + </ItemGroup> + + <ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'"> + <PackageReference Include="System.Data.SqlClient"> + <Version>4.8.3</Version> + </PackageReference> + <PackageReference Include="System.Windows.Forms.DataVisualization"> + <Version>1.0.0-prerelease.20110.1</Version> + </PackageReference> + </ItemGroup> <Choose> - <When Condition="'$(Configuration)|$(Platform)'=='MockupDebug|AnyCPU'"> + <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch( + $(FinalDefineConstants), '^(.*,)*MOCKUP(,.*)*$'))"> <ItemGroup> <ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" /> </ItemGroup> - <PropertyGroup> + <!--<PropertyGroup> <DefineConstants>MOCKUP</DefineConstants> - </PropertyGroup> + </PropertyGroup>--> </When> </Choose> - <ItemGroup> - <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj" /> - <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" /> - </ItemGroup> - - <ItemGroup> - <Import Include="Microsoft.VisualBasic" /> - <Import Include="System" /> - <Import Include="System.Collections" /> - <Import Include="System.Data" /> - <Import Include="System.Drawing" /> - <Import Include="System.Diagnostics" /> - <Import Include="System.Windows.Forms" /> - </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj" /> + <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" /> + </ItemGroup> + + <ItemGroup> + <Import Include="Microsoft.VisualBasic" /> + <Import Include="System" /> + <Import Include="System.Collections" /> + <Import Include="System.Data" /> + <Import Include="System.Drawing" /> + <Import Include="System.Diagnostics" /> + <Import Include="System.Windows.Forms" /> + </ItemGroup> + + <ItemGroup> + <Compile Update="My Project\Application.Designer.vb"> + <DesignTime>True</DesignTime> + <AutoGen>True</AutoGen> + <DependentUpon>Application.myapp</DependentUpon> + </Compile> + <Compile Update="My Project\Resources.Designer.vb"> + <DesignTime>True</DesignTime> + <AutoGen>True</AutoGen> + <DependentUpon>Resources.resx</DependentUpon> + </Compile> + <EmbeddedResource Update="My Project\Resources.resx"> + <CustomToolNamespace>My.Resources</CustomToolNamespace> + <Generator>VbMyResourcesResXFileCodeGenerator</Generator> + <LastGenOutput>Resources.Designer.vb</LastGenOutput> + </EmbeddedResource> + <Compile Update="My Project\Settings.Designer.vb"> + <DesignTimeSharedInput>True</DesignTimeSharedInput> + <AutoGen>True</AutoGen> + <DependentUpon>Settings.settings</DependentUpon> + </Compile> + <None Update="My Project\Application.myapp"> + <Generator>MyApplicationCodeGenerator</Generator> + <LastGenOutput>Application.Designer.vb</LastGenOutput> + </None> + <None Update="My Project\Settings.settings"> + <CustomToolNamespace>My</CustomToolNamespace> + <Generator>SettingsSingleFileGenerator</Generator> + <LastGenOutput>Settings.Designer.vb</LastGenOutput> + </None> + </ItemGroup> - <ItemGroup> - <Compile Update="My Project\Application.Designer.vb"> - <DesignTime>True</DesignTime> - <AutoGen>True</AutoGen> - <DependentUpon>Application.myapp</DependentUpon> - </Compile> - <Compile Update="My Project\Resources.Designer.vb"> - <DesignTime>True</DesignTime> - <AutoGen>True</AutoGen> - <DependentUpon>Resources.resx</DependentUpon> - </Compile> - <EmbeddedResource Update="My Project\Resources.resx"> - <CustomToolNamespace>My.Resources</CustomToolNamespace> - <Generator>VbMyResourcesResXFileCodeGenerator</Generator> - <LastGenOutput>Resources.Designer.vb</LastGenOutput> - </EmbeddedResource> - <Compile Update="My Project\Settings.Designer.vb"> - <DesignTimeSharedInput>True</DesignTimeSharedInput> - <AutoGen>True</AutoGen> - <DependentUpon>Settings.settings</DependentUpon> - </Compile> - <None Update="My Project\Application.myapp"> - <Generator>MyApplicationCodeGenerator</Generator> - <LastGenOutput>Application.Designer.vb</LastGenOutput> - </None> - <None Update="My Project\Settings.settings"> - <CustomToolNamespace>My</CustomToolNamespace> - <Generator>SettingsSingleFileGenerator</Generator> - <LastGenOutput>Settings.Designer.vb</LastGenOutput> - </None> - </ItemGroup> + <ItemGroup> + <EmbeddedResource Update="Resources\4x2r.png" /> + <EmbeddedResource Update="Resources\4x2rt.png" /> + <EmbeddedResource Update="Resources\4x2tt.png" /> + <EmbeddedResource Update="Resources\6x2r.png" /> + <EmbeddedResource Update="Resources\6x2rt.png" /> + <EmbeddedResource Update="Resources\6x2tt.png" /> + <EmbeddedResource Update="Resources\Undef.png" /> + </ItemGroup> - <ItemGroup> - <EmbeddedResource Update="Resources\4x2r.png" /> - <EmbeddedResource Update="Resources\4x2rt.png" /> - <EmbeddedResource Update="Resources\4x2tt.png" /> - <EmbeddedResource Update="Resources\6x2r.png" /> - <EmbeddedResource Update="Resources\6x2rt.png" /> - <EmbeddedResource Update="Resources\6x2tt.png" /> - <EmbeddedResource Update="Resources\Undef.png" /> - </ItemGroup> - </Project> \ No newline at end of file diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj index 1e76147a7ce33b2337fdffbd99a6e2fce0a89655..b523e4d257e31df28f70238e64d410a4c01dfa74 100644 --- a/VECTO3GUI2020/VECTO3GUI2020.csproj +++ b/VECTO3GUI2020/VECTO3GUI2020.csproj @@ -12,7 +12,7 @@ <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets> <TargetFrameworks>net48;net6.0-windows</TargetFrameworks> <DefineConstants /> - <Configurations>Debug;Release;MockupDebug</Configurations> + <Configurations>Debug;Release;MockupDebug;MockupRelease</Configurations> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net48|AnyCPU'"> <DebugType>full</DebugType> @@ -20,12 +20,15 @@ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net6.0-windows|AnyCPU'"> <DebugType>full</DebugType> </PropertyGroup> + <PropertyGroup Condition="('$(Configuration)' == 'MockupRelease') Or ('$(Configuration)' == 'MockupDebug')"> + <DefineConstants>$(DefineConstants);MOCKUP</DefineConstants> + </PropertyGroup> <ItemGroup> <PackageReference Include="InteractiveDataDisplay.WPF" Version="1.0.0" NoWarn="NU1701" /> <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" /> <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" NoWarn="NU1701" /> - <PackageReference Include="Ninject" Version="3.3.5" /> + <PackageReference Include="Ninject" Version="3.3.6" /> <PackageReference Include="Ninject.Extensions.Factory" Version="3.3.3" /> <PackageReference Include="PresentationFramework.Aero2" Version="1.0.1" NoWarn="NU1701" /> </ItemGroup> @@ -34,19 +37,19 @@ <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj" /> <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" /> </ItemGroup> - - <Choose> - <When Condition="'$(Configuration)|$(Platform)'=='MockupDebug|AnyCPU'"> - <ItemGroup> - <ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" /> - - </ItemGroup> - <PropertyGroup> - <DefineConstants>MOCKUP</DefineConstants> - </PropertyGroup> - </When> - </Choose> - + + <Choose> + <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch( + $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))"> + <ItemGroup> + <ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" /> + + </ItemGroup> + <!--<PropertyGroup> + <DefineConstants>MOCKUP</DefineConstants> + </PropertyGroup>--> + </When> + </Choose> diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj index 41526ead9a747195edea26f1c0d243f9f1490a4e..cee4dd27f40ea0557101d5546b9831a0cd038a84 100644 --- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj +++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj @@ -15,7 +15,7 @@ <PackageReference Include="NUnit" Version="3.13.2" /> <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> - <PackageReference Include="Ninject" Version="3.3.5" /> + <PackageReference Include="Ninject" Version="3.3.6" /> <PackageReference Include="NLog" Version="4.7.13" /> <PackageReference Include="Moq" Version="4.16.1" /> </ItemGroup> diff --git a/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj b/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj index 043215e73f7c58d7e6179ef7d21bad3d053aa8d5..2ace8812e86edf3aed01411c7922960afd86053b 100644 --- a/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj +++ b/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj @@ -10,7 +10,7 @@ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" /> <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" /> <PackageReference Include="Moq" Version="4.16.1" /> - <PackageReference Include="Ninject" Version="3.3.5" /> + <PackageReference Include="Ninject" Version="3.3.6" /> <PackageReference Include="NUnit" Version="3.13.2" /> <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" /> </ItemGroup> diff --git a/VectoCommon/VectoHashing/VectoHashing.csproj b/VectoCommon/VectoHashing/VectoHashing.csproj index f833fa86eb34d4986fa7a4a941b5fefba4267658..8a059112dc7a7617cfb2b73a7c9b67ef375db87b 100644 --- a/VectoCommon/VectoHashing/VectoHashing.csproj +++ b/VectoCommon/VectoHashing/VectoHashing.csproj @@ -8,6 +8,7 @@ <AssemblyName>VectoHashing</AssemblyName> <TargetFrameworks>net45;net48;net6.0</TargetFrameworks> <DefineConstants /> + <Configurations>Debug;Release;MockupRelease</Configurations> </PropertyGroup> <ItemGroup Condition="'$(TargetFramework)' == 'net45'"> diff --git a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj index 7ae9a4bc518f9131a2f68bff590ab9d7c01d1189..03da0bf0f22d1762e6daecf27507a7cd424236d5 100644 --- a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj +++ b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj @@ -7,7 +7,7 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Ninject" Version="3.3.5" /> + <PackageReference Include="Ninject" Version="3.3.6" /> <PackageReference Include="Ninject.Extensions.Factory" Version="3.3.3" /> <PackageReference Include="NUnit" Version="3.13.2" /> <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" /> diff --git a/VectoConsole/App.config b/VectoConsole/App.config index f3e7e3a3ca744804e9aff833998fa34e9908842b..159bad000818a6787e2f7daef2f54cb6f031d8ca 100644 --- a/VectoConsole/App.config +++ b/VectoConsole/App.config @@ -3,6 +3,15 @@ <configSections> <section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog" /> </configSections> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <!--<loadFromRemoteSources enabled="true"/>--> + <dependentAssembly> + <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-3.3.5.0" newVersion="3.3.6.0" /> + </dependentAssembly> + </assemblyBinding> + </runtime> <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd" autoReload="false" throwExceptions="false" internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log"> <targets async="true"> <target xsi:type="Console" name="ConsoleLogger" error="true" /> diff --git a/VectoConsole/Program.cs b/VectoConsole/Program.cs index 7af3dd2e2c22ea290fe667a63c4259b20ff7de66..2f43f120b314381f5ed3bc70fd4479f1ffc5d7f2 100644 --- a/VectoConsole/Program.cs +++ b/VectoConsole/Program.cs @@ -236,7 +236,7 @@ Examples: } fileWriter = new FileOutputWriter(file); - var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(mode, dataProvider, fileWriter); + var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(mode, dataProvider, fileWriter, null, null, true); //var runsFactory = SimulatorFactory.CreateSimulatorFactory(mode, dataProvider, fileWriter); runsFactory.ModalResults1Hz = args.Contains("-1Hz"); runsFactory.WriteModalResults = args.Contains("-mod"); diff --git a/VectoConsole/VectoConsole.csproj b/VectoConsole/VectoConsole.csproj index 7c77a74347629a1359866e9ffd42b7b7e25f8c9b..1fab91cd911dcc6e336d49fc0e56324ea8feb2c1 100644 --- a/VectoConsole/VectoConsole.csproj +++ b/VectoConsole/VectoConsole.csproj @@ -6,10 +6,22 @@ <ApplicationIcon>VECTO.ico</ApplicationIcon> <TargetFrameworks>net45;net48;net6.0</TargetFrameworks> <DefineConstants /> + <Configurations>Debug;Release;MockupDebug;MockupRelease</Configurations> </PropertyGroup> - + <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net45|AnyCPU'"> + <DebugType>full</DebugType> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net48|AnyCPU'"> + <DebugType>full</DebugType> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net6.0|AnyCPU'"> + <DebugType>full</DebugType> + </PropertyGroup> + <PropertyGroup Condition="('$(Configuration)' == 'MockupRelease') Or ('$(Configuration)' == 'MockupDebug')"> + <DefineConstants>$(DefineConstants);MOCKUP</DefineConstants> + </PropertyGroup> <ItemGroup> - <PackageReference Include="Ninject" Version="3.3.5" /> + <PackageReference Include="Ninject" Version="3.3.6" /> <PackageReference Include="NLog" Version="4.7.13" /> </ItemGroup> @@ -28,4 +40,16 @@ <ItemGroup> <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" /> </ItemGroup> + + <Choose> + <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
 $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))"> + <ItemGroup> + <ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" /> + + </ItemGroup> + <!--<PropertyGroup> + <DefineConstants>MOCKUP</DefineConstants> + </PropertyGroup>--> + </When> + </Choose> </Project> \ No newline at end of file diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs index 796d106fe09716e58da84a549542ab06a589f9cd..a0a439904b7984e69b42c106c4cff796a460f1d7 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs @@ -179,9 +179,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider public virtual bool ZeroEmissionVehicle => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_ZeroEmissionVehicle)); - public virtual bool HybridElectricHDV => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_HybridElectricHDV)); + public virtual bool HybridElectricHDV => ElementExists(XMLNames.Vehicle_HybridElectricHDV) + ? XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_HybridElectricHDV)) + : false; - public virtual bool DualFuelVehicle => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_DualFuelVehicle)); + public virtual bool DualFuelVehicle => ElementExists(XMLNames.Vehicle_DualFuelVehicle) + ? XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_DualFuelVehicle)) + : false; public virtual Watt MaxNetPower1 => ElementExists(XMLNames.Vehicle_MaxNetPower1) @@ -237,7 +241,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider public virtual Watt MaxChargingPower => ElementExists(XMLNames.Vehicle_MaxChargingPower) ? XmlConvert.ToInt32(GetString(XMLNames.Vehicle_MaxChargingPower)).SI<Watt>() : null; - public virtual VectoSimulationJobType VehicleType { get => throw new NotImplementedException("must be overriden in derived classes"); } + public virtual VectoSimulationJobType VehicleType { get => VectoSimulationJobType.ConventionalVehicle; } #region Implementation of IAdvancedDriverAssistantSystemDeclarationInputData diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationPrimaryBusVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationPrimaryBusVehicleDataProvider.cs index 3db4476ff29651db2dbe54d28fe8ea490b629a2d..a06e7213923da611f0d1cb057da3d29ba7f2c523 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationPrimaryBusVehicleDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationPrimaryBusVehicleDataProvider.cs @@ -114,6 +114,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24 public XMLDeclarationHevPxPrimaryBusDataProviderV24(IXMLDeclarationJobInputData jobData, XmlNode xmlNode, string sourceFile) : base(jobData, xmlNode, sourceFile) { } + + public override VectoSimulationJobType VehicleType => VectoSimulationJobType.ParallelHybridVehicle; } // --------------------------------------------------------------------------------------- @@ -134,6 +136,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24 : base(jobData, xmlNode, sourceFile) { } public override IList<ITorqueLimitInputData> TorqueLimits => null; + + public override VectoSimulationJobType VehicleType => VectoSimulationJobType.SerialHybridVehicle; } // --------------------------------------------------------------------------------------- @@ -158,6 +162,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24 public override IList<ITorqueLimitInputData> TorqueLimits => null; #endregion + + public override VectoSimulationJobType VehicleType => VectoSimulationJobType.BatteryElectricVehicle; } @@ -179,6 +185,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24 public override bool Articulated => GetBool(XMLNames.Vehicle_Articulated); + public override VectoSimulationJobType VehicleType => VectoSimulationJobType.BatteryElectricVehicle; + #endregion } @@ -203,6 +211,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24 public override IList<ITorqueLimitInputData> TorqueLimits => null; + #region Overrides of AbstractXMLVehicleDataProviderV24 + + public override VectoSimulationJobType VehicleType => VectoSimulationJobType.SerialHybridVehicle; + + #endregion #endregion } diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs index b4dfa81ff8cb72c4ff9f5ddfa89d4bcf764dba5d..09465baf9c3c4289d07a0dc8bf43fc620438bbef 100644 --- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs +++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs @@ -18,8 +18,8 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl { protected DeclarationDataAdapterPrimaryBus _dao = new DeclarationDataAdapterPrimaryBus(); - public DeclarationModePrimaryBusVectoRunDataFactory(IDeclarationInputDataProvider dataProvider, IDeclarationReport report) : - base(dataProvider, report) + public DeclarationModePrimaryBusVectoRunDataFactory(IDeclarationInputDataProvider dataProvider, IDeclarationReport report, bool checkJobType = true) : + base(dataProvider, report, checkJobType) { } #region Overrides of AbstractDeclarationVectoRunDataFactory diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs index 310651e9bd62c8f53612d9b4eaa21e7a9babac27..a3a7018557261324d179d1e6099b7203da6c2e08 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs @@ -46,8 +46,8 @@ using TUGraz.VectoCore.Configuration; using TUGraz.VectoCore.Models.Declaration; using TUGraz.VectoCore.Utils; -#if MOCKUPDEBUG -[assembly:InternalsVisibleTo("VectoMockup")] +#if (MOCKUP || DEBUG) //DEBUG to prevent errors in Visual studio + [assembly:InternalsVisibleTo("VectoMockup")] #endif namespace TUGraz.VectoCore.Models.SimulationComponent.Data diff --git a/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs b/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs index aa8275205b2a3c56c727038e6ecaa837b17bb7b9..ed368bc1c4a2c94b2ea74d4a2a6ba2c431664348 100644 --- a/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs +++ b/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs @@ -94,7 +94,7 @@ namespace TUGraz.VectoCore LoadModule<CIFNinjectModule>(); -#if (MOCKUPDEBUG) //TODO: add second constant for release +#if (MOCKUP) //TODO: add second constant for release var compiledModuleLoaderPlugin = new CompiledModuleLoaderPlugin(Kernel, new AssemblyNameRetriever()); var assembly = Assembly.LoadFile(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),"VectoMockup.dll")); //var assembly = Assembly.LoadFile("VectoMockup.dll"); diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAirdragType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAirdragType.cs index 08b291a7ffebb318ba485f404cf120b57fceceaf..10d5407af0c5e579b13c38cdd8126a2f1edd15fb 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAirdragType.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAirdragType.cs @@ -26,6 +26,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. public XElement GetXmlType(IAirdragDeclarationInputData inputData) { + if (inputData == null || inputData.AirDragArea == null) { + return null; + } return new XElement(_mrf + XMLNames.Component_AirDrag, new XElement(_mrf + XMLNames.Component_Model, inputData.Model), new XElement(_mrf + XMLNames.Component_CertificationMethod, inputData.CertificationMethod), @@ -33,7 +36,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. ? null : new XElement(_mrf + XMLNames.Component_CertificationNumber, inputData.CertificationNumber), new XElement(_mrf + "CdxA", inputData.AirDragArea.ToXMLFormat(2)), - new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, inputData.DigestValue.DigestValue)); + new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, inputData.DigestValue?.DigestValue ?? "")); } #endregion diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAngleDriveType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAngleDriveType.cs index 332168be5fac1b2a97184ad88866036bb76c5024..5ca8b6c3661c41d28e48444e8f2894e0ecfc4edd 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAngleDriveType.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAngleDriveType.cs @@ -20,10 +20,13 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. public XElement GetElement(IDeclarationInputDataProvider inputData) { var angleDriveData = inputData.JobInputData.Vehicle.Components.AngledriveInputData; + if (angleDriveData == null || angleDriveData.Type == AngledriveType.None) { + return null; + } return new XElement(_mrf + XMLNames.Component_Angledrive, new XElement(_mrf + XMLNames.Component_Model, angleDriveData.Model), new XElement(_mrf + XMLNames.Component_CertificationNumber, angleDriveData.CertificationNumber), - new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, angleDriveData.DigestValue.DigestValue), + new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, angleDriveData.DigestValue?.DigestValue ?? ""), new XElement(_mrf + XMLNames.Component_CertificationMethod, angleDriveData.CertificationMethod.ToXMLFormat()), new XElement(_mrf + "AngledriveRatio", angleDriveData.Ratio.ToXMLFormat(3))); } diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAxleGearType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAxleGearType.cs index 3df2021d71426aac84b7ba36e0195d44ae2fddb5..0ed3f6c7024c6c5a026b8e697d31bcea35812fcf 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAxleGearType.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAxleGearType.cs @@ -24,7 +24,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. new XElement(_mrf + XMLNames.Component_Model, axleGearInputData.Model), new XElement(_mrf + XMLNames.Component_CertificationNumber, axleGearInputData.CertificationNumber), new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, - axleGearInputData.DigestValue.DigestValue), + axleGearInputData.DigestValue?.DigestValue ?? ""), new XElement(_mrf + XMLNames.Component_CertificationMethod, axleGearInputData.CertificationMethod.ToXMLFormat()), new XElement(_mrf + "AxleType", axleGearInputData.LineType.ToXMLFormat()), diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAxleWheelsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAxleWheelsType.cs index c2005becffc6e7b676f9dfde481b73e3505f5764..23b49e435f3e1179fd294c610e99384c025afb70 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAxleWheelsType.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAxleWheelsType.cs @@ -32,7 +32,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. new XElement(_mrf + XMLNames.Report_Tyre_TyreDimension, axleDeclaration.Tyre.Dimension), new XElement(_mrf + XMLNames.Component_CertificationNumber, axleDeclaration.Tyre.CertificationNumber), new XElement(_mrf + "SpecificRRC", axleDeclaration.Tyre.RollResistanceCoefficient.ToXMLFormat(4)), - new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, axleDeclaration.Tyre.DigestValue.DigestValue))); + new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, axleDeclaration.Tyre.DigestValue?.DigestValue ?? ""))); result.Add(axle); } diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFElectricMachinesType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFElectricMachinesType.cs index 3fc10b5a2a6c4ba078512632a5963f0bbcfed7a9..cd6bc82c564468d19d3338d15e1d0e5da1b38f45 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFElectricMachinesType.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFElectricMachinesType.cs @@ -33,7 +33,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. electricMachineSystem.Add(new XElement(_mrf + XMLNames.Component_Model, electricMachine.ElectricMachine.Model), new XElement(_mrf + XMLNames.Component_CertificationNumber, electricMachine.ElectricMachine.CertificationNumber), - new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, electricMachine.ElectricMachine.DigestValue.DigestValue), + new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, electricMachine.ElectricMachine.DigestValue?.DigestValue ?? ""), new XElement(_mrf + XMLNames.ElectricMachine_ElectricMachineType, electricMachine.ElectricMachine.ElectricMachineType), new XElement(_mrf + XMLNames.Component_CertificationMethod, electricMachine.ElectricMachine.CertificationMethod), new XElement(_mrf + "RatedPower", electricMachine.ElectricMachine.R85RatedPower.ToXMLFormat(0))); @@ -59,7 +59,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. result.Add(new XElement(_mrf + XMLNames.Component_ADC, new XElement(_mrf + XMLNames.Component_Model, adc.Model), new XElement(_mrf + XMLNames.Component_CertificationNumber, adc.CertificationNumber), - new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, adc.DigestValue.DigestValue), + new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, adc.DigestValue?.DigestValue ?? ""), new XElement(_mrf + XMLNames.Component_CertificationMethod, adc.CertificationMethod.ToXMLFormat()), new XElement(_mrf + XMLNames.AngleDrive_Ratio, adc.Ratio.ToXMLFormat(3))) ); diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFEngineType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFEngineType.cs index cc62e4b22bcb919d1190f89883bc191c1cbf82cb..1ca8863ded747f06d6967526880026e488f9c0af 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFEngineType.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFEngineType.cs @@ -24,7 +24,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. var result = new XElement(_mrf + XMLNames.Component_Engine, new XElement(_mrf + XMLNames.Component_Model, engineData.Model), new XElement(_mrf + XMLNames.Component_CertificationNumber, engineData.CertificationNumber), - new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, engineData.DigestValue.DigestValue), + new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, engineData.DigestValue?.DigestValue ?? ""), new XElement(_mrf + XMLNames.Engine_RatedPower, engineData.RatedPowerDeclared.ToXMLFormat(0)), new XElement(_mrf + XMLNames.Engine_IdlingSpeed, inputData.JobInputData.Vehicle.EngineIdleSpeed.AsRPM.ToXMLFormat(0)), new XElement(_mrf + XMLNames.Engine_RatedSpeed, inputData.JobInputData.Vehicle.Components.EngineInputData.RatedSpeedDeclared.AsRPM.ToXMLFormat(0)), diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCSpecificationsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCSpecificationsType.cs index 5a578d7d46df19cf4546f8022503f680cc313009..9acaae31c7a71b35810b720a86dd5962dc5c7b51 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCSpecificationsType.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCSpecificationsType.cs @@ -24,7 +24,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. var iepcXElement = new XElement(_mrf + "IEPCSpecifications", new XElement(_mrf + XMLNames.Component_Model, iepcData.Model), new XElement(_mrf + XMLNames.Component_CertificationNumber, iepcData.CertificationNumber), - new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, iepcData.DigestValue.DigestValue), + new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, iepcData.DigestValue?.DigestValue ?? ""), new XElement(_mrf + XMLNames.Engine_RatedPower, iepcData.R85RatedPower.ToXMLFormat())); //new XElement(_mrf + "MaxContinuousPower",(iepcData.ContinuousTorque*iepcData.ContinuousTorqueSpeed).ToXMLFormat()), diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIepcSpecificationsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIepcSpecificationsType.cs index 5a578d7d46df19cf4546f8022503f680cc313009..9acaae31c7a71b35810b720a86dd5962dc5c7b51 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIepcSpecificationsType.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIepcSpecificationsType.cs @@ -24,7 +24,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. var iepcXElement = new XElement(_mrf + "IEPCSpecifications", new XElement(_mrf + XMLNames.Component_Model, iepcData.Model), new XElement(_mrf + XMLNames.Component_CertificationNumber, iepcData.CertificationNumber), - new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, iepcData.DigestValue.DigestValue), + new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, iepcData.DigestValue?.DigestValue ?? ""), new XElement(_mrf + XMLNames.Engine_RatedPower, iepcData.R85RatedPower.ToXMLFormat())); //new XElement(_mrf + "MaxContinuousPower",(iepcData.ContinuousTorque*iepcData.ContinuousTorqueSpeed).ToXMLFormat()), diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFREESSSpecificationsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFREESSSpecificationsType.cs index 3673b529f3aba9480d635f3dab71853bc5d2b6aa..bb2c3f2e7740618ed8f52144504a7719e7e9545c 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFREESSSpecificationsType.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFREESSSpecificationsType.cs @@ -33,7 +33,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. new XAttribute("stringId", electricStorage.StringId), new XElement(_mrf + XMLNames.Component_Model, battery.Model), new XElement(_mrf + XMLNames.Component_CertificationNumber, battery.CertificationNumber), - new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, battery.DigestValue.DigestValue), + new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, battery.DigestValue?.DigestValue ?? ""), new XElement(_mrf + XMLNames.BusAux_ElectricSystem_NominalVoltage, BatterySOCReader.Create(battery.VoltageCurve).Lookup(0.5).ToXMLFormat(0)), new XElement(_mrf + "TotalStorageCapacity", battery.Capacity.AsAmpHour.ToXMLFormat(0)), new XElement(_mrf + "TotalUsableCapacityInSimulation", battery.TotalUsableCapacityInSimulation().AsAmpHour), @@ -48,7 +48,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. new XElement(_mrf + XMLNames.Capacitor_Capacitance, superCap.Capacity.ToXMLFormat()), new XElement(_mrf + XMLNames.Capacitor_MinVoltage, superCap.MinVoltage), new XElement(_mrf + XMLNames.Capacitor_MaxVoltage, superCap.MinVoltage), - new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, superCap.DigestValue.DigestValue) + new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, superCap.DigestValue?.DigestValue ?? "") ); } else { throw new VectoException("Invalid REESS type"); diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFRetarderType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFRetarderType.cs index 54a09d43f6e741f287a9b8074cc7762dd870005a..ec14cb417114bacc9f62a3fa92a7285f612865ed 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFRetarderType.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFRetarderType.cs @@ -19,11 +19,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. public XElement GetElement(IDeclarationInputDataProvider inputData) { var retarderData = inputData.JobInputData.Vehicle.Components.RetarderInputData; + if (retarderData == null || retarderData.Type == RetarderType.None) { + return null; + } var result = new XElement(_mrf + XMLNames.Component_Retarder, new XElement(_mrf + XMLNames.Component_Model, inputData.JobInputData.Vehicle.Components.RetarderInputData.Model), new XElement(_mrf + XMLNames.Component_CertificationNumber, retarderData.CertificationNumber), - new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, retarderData.DigestValue.DigestValue), + new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, retarderData.DigestValue?.DigestValue ?? ""), new XElement(_mrf + XMLNames.Component_CertificationMethod, retarderData.CertificationMethod.ToXMLFormat())); return result; diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTorqueConverterType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTorqueConverterType.cs index 0ed4835554018d42422ba1017aeae777d128b6a2..179d1fa73defe5ce8ef268cce2728bbd13242712 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTorqueConverterType.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTorqueConverterType.cs @@ -23,7 +23,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. new XElement(_mrf + XMLNames.Component_Model, torqueConverterInputData.Model), new XElement(_mrf + XMLNames.Component_CertificationNumber, torqueConverterInputData.CertificationNumber), - new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, torqueConverterInputData.DigestValue.DigestValue), + new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, torqueConverterInputData.DigestValue?.DigestValue ?? ""), new XElement(_mrf + XMLNames.Component_CertificationMethod, torqueConverterInputData.CertificationMethod.ToXMLFormat())); } diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTorqueLimitationsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTorqueLimitationsType.cs index 722dd8b85ab00f7fba573c92a20c999c77dcc71b..55e1b58109b4e7675826e60998931b755e7b24bb 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTorqueLimitationsType.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTorqueLimitationsType.cs @@ -15,7 +15,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. public XElement GetElement(IDeclarationInputDataProvider inputData) { - if (inputData.JobInputData.Vehicle.TorqueLimits == null) { + if (inputData.JobInputData.Vehicle.TorqueLimits == null || inputData.JobInputData.Vehicle.TorqueLimits.Count == 0) { return null; } diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTransmissionType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTransmissionType.cs index 224e66b3c48177e7f2e3300f2e2ee3be0ea8d23d..e4328256b0078487caa22070addd9de6a27daca5 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTransmissionType.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTransmissionType.cs @@ -25,7 +25,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. new XElement(_mrf + XMLNames.Component_CertificationNumber, vehicleComponents.GearboxInputData.CertificationNumber), new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, - vehicleComponents.GearboxInputData.DigestValue.DigestValue), + vehicleComponents.GearboxInputData.DigestValue?.DigestValue ?? ""), new XElement(_mrf + "Type", vehicleComponents.GearboxInputData.Type.ToXMLFormat()), new XElement(_mrf + "NrOfGears", vehicleComponents.GearboxInputData.Gears.Count), diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj index ce247787a757e23a4fe15363896c8175bb16c4c3..ae8fb0fd94e6deb9db185f704c06257ee6842e55 100644 --- a/VectoCore/VectoCore/VectoCore.csproj +++ b/VectoCore/VectoCore/VectoCore.csproj @@ -4,9 +4,9 @@ <AssemblyName>VectoCore</AssemblyName> <TargetFrameworks>net45;net48;net6.0</TargetFrameworks> <DefineConstants /> - <Configurations>Debug;Release;MockupDebug</Configurations> + <Configurations>Debug;Release;MockupDebug;MockupRelease</Configurations> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net45|AnyCPU'"> + <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net45|AnyCPU'"> <DebugType>full</DebugType> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net48|AnyCPU'"> @@ -15,7 +15,10 @@ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net6.0|AnyCPU'"> <DebugType>full</DebugType> </PropertyGroup> - <ItemGroup> + <PropertyGroup Condition="('$(Configuration)' == 'MockupRelease') Or ('$(Configuration)' == 'MockupDebug')"> + <DefineConstants>$(DefineConstants);MOCKUP</DefineConstants> + </PropertyGroup> + <ItemGroup> <None Remove="Resources\Declaration\Buses\DefaultActuationsMap.apac" /> <None Remove="Resources\Declaration\VAUXBus\DEFAULT_1-Cylinder_1-Stage_393ccm.acmp" /> <None Remove="Resources\Declaration\VAUXBus\DEFAULT_2-Cylinder_1-Stage_650ccm.acmp" /> @@ -29,7 +32,7 @@ <ItemGroup> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> - <PackageReference Include="Ninject" Version="3.3.5" /> + <PackageReference Include="Ninject" Version="3.3.6" /> <PackageReference Include="Ninject.Extensions.ContextPreservation" Version="3.3.1" /> <PackageReference Include="Ninject.Extensions.Factory" Version="3.3.3" /> <PackageReference Include="NLog" Version="4.7.13" /> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/conventional_completed_bus.VIF_Report_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/conventional_completed_bus.VIF_Report_3.xml index 4a5db54cda61e307cbb1f885350414c5766ef0b3..779001dfcd5680126a28528c21d4ec5c5afea9dc 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/conventional_completed_bus.VIF_Report_3.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/conventional_completed_bus.VIF_Report_3.xml @@ -2,7 +2,7 @@ <tns:VectoOutputMultistage xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"> <tns:PrimaryVehicle> <Data id="VEH-287da6b1275749ac832d" xsi:type="PrimaryVehicleDataType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"> - <Vehicle xsi:type="VehiclePIFType"> + <Vehicle xsi:type="ConventionalVehicleVIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> @@ -31,7 +31,7 @@ </tns:TorqueLimits> <Components xsi:type="Vehicle_Conventional_ComponentsVIFType"> <Engine> - <Data xsi:type="EngineDataPIFType"> + <Data xsi:type="EngineDataVIFType"> <Manufacturer>Generic Engine Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck Engine</Model> <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> @@ -67,14 +67,14 @@ </Data> </Engine> <Transmission> - <Data xsi:type="TransmissionDataPIFType"> + <Data xsi:type="TransmissionDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck Gearbox</Model> <MainCertificationMethod>Standard values</MainCertificationMethod> <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> <TransmissionType>AMT</TransmissionType> - <Gears xsi:type="TransmissionGearsPIFType"> + <Gears xsi:type="TransmissionGearsVIFType"> <Gear number="1"> <Ratio>14.930</Ratio> <MaxTorque>1900</MaxTorque> @@ -128,7 +128,7 @@ </Data> </Transmission> <Axlegear> - <Data xsi:type="AxlegearDataPIFType"> + <Data xsi:type="AxlegearDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck AxleGear</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -139,7 +139,7 @@ </Data> </Axlegear> <AxleWheels> - <Data xsi:type="AxleWheelsDataPIFType"> + <Data xsi:type="AxleWheelsDataVIFType"> <Axles> <Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType"> <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType> @@ -199,7 +199,7 @@ </Data> </AxleWheels> <Auxiliaries> - <Data xsi:type="AuxiliaryDataPIFType"> + <Data xsi:type="AuxiliaryDataVIFType"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml index 7a72a1a03e182c6fcd8a0ef38e95c743f939fbae..738ac530eec0810a1e66e935ba3f4194d7bc43b5 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml @@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd"> <PrimaryVehicle> <Data id="text" xsi:type="PrimaryVehicleDataType"> - <Vehicle xsi:type="VehiclePIFType"> + <Vehicle xsi:type="ConventionalVehicleVIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> @@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </TorqueLimits> <Components xsi:type="Vehicle_Conventional_ComponentsVIFType"> <Engine> - <Data xsi:type="EngineDataPIFType"> + <Data xsi:type="EngineDataVIFType"> <Manufacturer>Generic Engine Manufacturer</Manufacturer> <Model>Bus 6x2</Model> <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> @@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Engine> <Transmission> - <Data xsi:type="TransmissionDataPIFType"> + <Data xsi:type="TransmissionDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck Gearbox</Model> <MainCertificationMethod>Standard values</MainCertificationMethod> @@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> <TransmissionType>AMT</TransmissionType> - <Gears xsi:type="TransmissionGearsPIFType"> + <Gears xsi:type="TransmissionGearsVIFType"> <Gear number="1"> <Ratio>14.930</Ratio> <MaxTorque>1900</MaxTorque> @@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Transmission> <TorqueConverter> - <Data xsi:type="TorqueConverterDataPIFType"> + <Data xsi:type="TorqueConverterDataVIFType"> <Manufacturer>Generic Torque Converter</Manufacturer> <Model>Generic Torque Converter Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </TorqueConverter> <Angledrive> - <Data xsi:type="AngledriveDataPIFType"> + <Data xsi:type="AngledriveDataVIFType"> <Manufacturer>Generic Angledrive</Manufacturer> <Model>Generic Angledrive Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Angledrive> <Axlegear> - <Data xsi:type="AxlegearDataPIFType"> + <Data xsi:type="AxlegearDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck AxleGear</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Axlegear> <AxleWheels> - <Data xsi:type="AxleWheelsDataPIFType"> + <Data xsi:type="AxleWheelsDataVIFType"> <Axles> <Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType"> <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType> @@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </AxleWheels> <Auxiliaries> - <Data xsi:type="AuxiliaryDataPIFType"> + <Data xsi:type="AuxiliaryDataVIFType"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> @@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </ApplicationInformation> </Data> <Signature> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> @@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <ManufacturingStep stepCount="2"> <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStep> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml index d3212ae3ceaf478ddfd95f3e82175e545a8d362c..2b6805c520ac9ad7997b94052c101ee1966123a8 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml @@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd"> <PrimaryVehicle> <Data id="text" xsi:type="PrimaryVehicleDataType"> - <Vehicle xsi:type="VehiclePIFType"> + <Vehicle xsi:type="ConventionalVehicleVIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> @@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </TorqueLimits> <Components xsi:type="Vehicle_Conventional_ComponentsVIFType"> <Engine> - <Data xsi:type="EngineDataPIFType"> + <Data xsi:type="EngineDataVIFType"> <Manufacturer>Generic Engine Manufacturer</Manufacturer> <Model>Bus 6x2</Model> <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> @@ -78,7 +78,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Engine> <Transmission> - <Data xsi:type="TransmissionDataPIFType"> + <Data xsi:type="TransmissionDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck Gearbox</Model> <MainCertificationMethod>Standard values</MainCertificationMethod> @@ -86,7 +86,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> <TransmissionType>AMT</TransmissionType> - <Gears xsi:type="TransmissionGearsPIFType"> + <Gears xsi:type="TransmissionGearsVIFType"> <Gear number="1"> <Ratio>14.930</Ratio> <MaxTorque>1900</MaxTorque> @@ -140,7 +140,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Transmission> <TorqueConverter> - <Data xsi:type="TorqueConverterDataPIFType"> + <Data xsi:type="TorqueConverterDataVIFType"> <Manufacturer>Generic Torque Converter</Manufacturer> <Model>Generic Torque Converter Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -155,7 +155,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </TorqueConverter> <Angledrive> - <Data xsi:type="AngledriveDataPIFType"> + <Data xsi:type="AngledriveDataVIFType"> <Manufacturer>Generic Angledrive</Manufacturer> <Model>Generic Angledrive Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -166,7 +166,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Angledrive> <Axlegear> - <Data xsi:type="AxlegearDataPIFType"> + <Data xsi:type="AxlegearDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck AxleGear</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -178,7 +178,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Axlegear> <AxleWheels> - <Data xsi:type="AxleWheelsDataPIFType"> + <Data xsi:type="AxleWheelsDataVIFType"> <Axles> <Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType"> <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType> @@ -265,7 +265,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </AxleWheels> <Auxiliaries> - <Data xsi:type="AuxiliaryDataPIFType"> + <Data xsi:type="AuxiliaryDataVIFType"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> @@ -631,7 +631,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </ApplicationInformation> </Data> <Signature> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> @@ -644,7 +644,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <ManufacturingStep stepCount="2"> <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStep> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml index f505ceb37ba46bb28a233f6435708bc2cf24357f..cc342b4b8c5787830a63be9f1bf00220ac75fd21 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml @@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd"> <PrimaryVehicle> <Data id="text" xsi:type="PrimaryVehicleDataType"> - <Vehicle xsi:type="VehiclePIFType"> + <Vehicle xsi:type="ConventionalVehicleVIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> @@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </TorqueLimits> <Components xsi:type="Vehicle_Conventional_ComponentsVIFType"> <Engine> - <Data xsi:type="EngineDataPIFType"> + <Data xsi:type="EngineDataVIFType"> <Manufacturer>Generic Engine Manufacturer</Manufacturer> <Model>Bus 6x2</Model> <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> @@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Engine> <Transmission> - <Data xsi:type="TransmissionDataPIFType"> + <Data xsi:type="TransmissionDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck Gearbox</Model> <MainCertificationMethod>Standard values</MainCertificationMethod> @@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> <TransmissionType>AMT</TransmissionType> - <Gears xsi:type="TransmissionGearsPIFType"> + <Gears xsi:type="TransmissionGearsVIFType"> <Gear number="1"> <Ratio>14.930</Ratio> <MaxTorque>1900</MaxTorque> @@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Transmission> <TorqueConverter> - <Data xsi:type="TorqueConverterDataPIFType"> + <Data xsi:type="TorqueConverterDataVIFType"> <Manufacturer>Generic Torque Converter</Manufacturer> <Model>Generic Torque Converter Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </TorqueConverter> <Angledrive> - <Data xsi:type="AngledriveDataPIFType"> + <Data xsi:type="AngledriveDataVIFType"> <Manufacturer>Generic Angledrive</Manufacturer> <Model>Generic Angledrive Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Angledrive> <Axlegear> - <Data xsi:type="AxlegearDataPIFType"> + <Data xsi:type="AxlegearDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck AxleGear</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Axlegear> <AxleWheels> - <Data xsi:type="AxleWheelsDataPIFType"> + <Data xsi:type="AxleWheelsDataVIFType"> <Axles> <Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType"> <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType> @@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </AxleWheels> <Auxiliaries> - <Data xsi:type="AuxiliaryDataPIFType"> + <Data xsi:type="AuxiliaryDataVIFType"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> @@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </ApplicationInformation> </Data> <Signature> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> @@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <ManufacturingStep stepCount="2"> <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStep> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml index 5043f42e58b6b3defa9c91310cfaf60291429d37..8ab37cc3ce0a7d990e26e6df27f7fe08dfdb60b1 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml @@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd"> <PrimaryVehicle> <Data id="text" xsi:type="PrimaryVehicleDataType"> - <Vehicle xsi:type="VehiclePIFType"> + <Vehicle xsi:type="ConventionalVehicleVIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> @@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </TorqueLimits> <Components xsi:type="Vehicle_Conventional_ComponentsVIFType"> <Engine> - <Data xsi:type="EngineDataPIFType"> + <Data xsi:type="EngineDataVIFType"> <Manufacturer>Generic Engine Manufacturer</Manufacturer> <Model>Bus 6x2</Model> <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> @@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Engine> <Transmission> - <Data xsi:type="TransmissionDataPIFType"> + <Data xsi:type="TransmissionDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck Gearbox</Model> <MainCertificationMethod>Standard values</MainCertificationMethod> @@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> <TransmissionType>AMT</TransmissionType> - <Gears xsi:type="TransmissionGearsPIFType"> + <Gears xsi:type="TransmissionGearsVIFType"> <Gear number="1"> <Ratio>14.930</Ratio> <MaxTorque>1900</MaxTorque> @@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Transmission> <TorqueConverter> - <Data xsi:type="TorqueConverterDataPIFType"> + <Data xsi:type="TorqueConverterDataVIFType"> <Manufacturer>Generic Torque Converter</Manufacturer> <Model>Generic Torque Converter Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </TorqueConverter> <Angledrive> - <Data xsi:type="AngledriveDataPIFType"> + <Data xsi:type="AngledriveDataVIFType"> <Manufacturer>Generic Angledrive</Manufacturer> <Model>Generic Angledrive Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Angledrive> <Axlegear> - <Data xsi:type="AxlegearDataPIFType"> + <Data xsi:type="AxlegearDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck AxleGear</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Axlegear> <AxleWheels> - <Data xsi:type="AxleWheelsDataPIFType"> + <Data xsi:type="AxleWheelsDataVIFType"> <Axles> <Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType"> <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType> @@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </AxleWheels> <Auxiliaries> - <Data xsi:type="AuxiliaryDataPIFType"> + <Data xsi:type="AuxiliaryDataVIFType"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> @@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </ApplicationInformation> </Data> <Signature> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> @@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <ManufacturingStep stepCount="2"> <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStep> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml index b3394584fe60757bcfc79acac456b4f451248030..38628a09bad3a350cfc50931ba19b719643e9bf3 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml @@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd"> <PrimaryVehicle> <Data id="text" xsi:type="PrimaryVehicleDataType"> - <Vehicle xsi:type="VehiclePIFType"> + <Vehicle xsi:type="ConventionalVehicleVIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> @@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </TorqueLimits> <Components xsi:type="Vehicle_Conventional_ComponentsVIFType"> <Engine> - <Data xsi:type="EngineDataPIFType"> + <Data xsi:type="EngineDataVIFType"> <Manufacturer>Generic Engine Manufacturer</Manufacturer> <Model>Bus 6x2</Model> <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> @@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Engine> <Transmission> - <Data xsi:type="TransmissionDataPIFType"> + <Data xsi:type="TransmissionDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck Gearbox</Model> <MainCertificationMethod>Standard values</MainCertificationMethod> @@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> <TransmissionType>AMT</TransmissionType> - <Gears xsi:type="TransmissionGearsPIFType"> + <Gears xsi:type="TransmissionGearsVIFType"> <Gear number="1"> <Ratio>14.930</Ratio> <MaxTorque>1900</MaxTorque> @@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Transmission> <TorqueConverter> - <Data xsi:type="TorqueConverterDataPIFType"> + <Data xsi:type="TorqueConverterDataVIFType"> <Manufacturer>Generic Torque Converter</Manufacturer> <Model>Generic Torque Converter Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </TorqueConverter> <Angledrive> - <Data xsi:type="AngledriveDataPIFType"> + <Data xsi:type="AngledriveDataVIFType"> <Manufacturer>Generic Angledrive</Manufacturer> <Model>Generic Angledrive Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Angledrive> <Axlegear> - <Data xsi:type="AxlegearDataPIFType"> + <Data xsi:type="AxlegearDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck AxleGear</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Axlegear> <AxleWheels> - <Data xsi:type="AxleWheelsDataPIFType"> + <Data xsi:type="AxleWheelsDataVIFType"> <Axles> <Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType"> <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType> @@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </AxleWheels> <Auxiliaries> - <Data xsi:type="AuxiliaryDataPIFType"> + <Data xsi:type="AuxiliaryDataVIFType"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> @@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </ApplicationInformation> </Data> <Signature> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> @@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <ManufacturingStep stepCount="2"> <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStep> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml index 2ba8f57a749a5a7715e1ae74d11a24bf3442c14f..3ebda336e48fe9904386339787b4f21f504fa1a6 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml @@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd"> <PrimaryVehicle> <Data id="text" xsi:type="PrimaryVehicleDataType"> - <Vehicle xsi:type="VehiclePIFType"> + <Vehicle xsi:type="ConventionalVehicleVIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> @@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </TorqueLimits> <Components xsi:type="Vehicle_Conventional_ComponentsVIFType"> <Engine> - <Data xsi:type="EngineDataPIFType"> + <Data xsi:type="EngineDataVIFType"> <Manufacturer>Generic Engine Manufacturer</Manufacturer> <Model>Bus 6x2</Model> <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> @@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Engine> <Transmission> - <Data xsi:type="TransmissionDataPIFType"> + <Data xsi:type="TransmissionDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck Gearbox</Model> <MainCertificationMethod>Standard values</MainCertificationMethod> @@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> <TransmissionType>AMT</TransmissionType> - <Gears xsi:type="TransmissionGearsPIFType"> + <Gears xsi:type="TransmissionGearsVIFType"> <Gear number="1"> <Ratio>14.930</Ratio> <MaxTorque>1900</MaxTorque> @@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Transmission> <TorqueConverter> - <Data xsi:type="TorqueConverterDataPIFType"> + <Data xsi:type="TorqueConverterDataVIFType"> <Manufacturer>Generic Torque Converter</Manufacturer> <Model>Generic Torque Converter Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </TorqueConverter> <Angledrive> - <Data xsi:type="AngledriveDataPIFType"> + <Data xsi:type="AngledriveDataVIFType"> <Manufacturer>Generic Angledrive</Manufacturer> <Model>Generic Angledrive Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Angledrive> <Axlegear> - <Data xsi:type="AxlegearDataPIFType"> + <Data xsi:type="AxlegearDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck AxleGear</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Axlegear> <AxleWheels> - <Data xsi:type="AxleWheelsDataPIFType"> + <Data xsi:type="AxleWheelsDataVIFType"> <Axles> <Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType"> <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType> @@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </AxleWheels> <Auxiliaries> - <Data xsi:type="AuxiliaryDataPIFType"> + <Data xsi:type="AuxiliaryDataVIFType"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> @@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </ApplicationInformation> </Data> <Signature> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> @@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <ManufacturingStep stepCount="2"> <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStep> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml index 3df6a06be5991a872196beccdf6e4ef0a3ca445b..c13114a284e01e3a2ee4f80f6cf5c2898a1149c3 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml @@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd"> <PrimaryVehicle> <Data id="text" xsi:type="PrimaryVehicleDataType"> - <Vehicle xsi:type="VehiclePIFType"> + <Vehicle xsi:type="ConventionalVehicleVIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> @@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </TorqueLimits> <Components xsi:type="Vehicle_Conventional_ComponentsVIFType"> <Engine> - <Data xsi:type="EngineDataPIFType"> + <Data xsi:type="EngineDataVIFType"> <Manufacturer>Generic Engine Manufacturer</Manufacturer> <Model>Bus 6x2</Model> <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> @@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Engine> <Transmission> - <Data xsi:type="TransmissionDataPIFType"> + <Data xsi:type="TransmissionDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck Gearbox</Model> <MainCertificationMethod>Standard values</MainCertificationMethod> @@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> <TransmissionType>AMT</TransmissionType> - <Gears xsi:type="TransmissionGearsPIFType"> + <Gears xsi:type="TransmissionGearsVIFType"> <Gear number="1"> <Ratio>14.930</Ratio> <MaxTorque>1900</MaxTorque> @@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Transmission> <TorqueConverter> - <Data xsi:type="TorqueConverterDataPIFType"> + <Data xsi:type="TorqueConverterDataVIFType"> <Manufacturer>Generic Torque Converter</Manufacturer> <Model>Generic Torque Converter Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </TorqueConverter> <Angledrive> - <Data xsi:type="AngledriveDataPIFType"> + <Data xsi:type="AngledriveDataVIFType"> <Manufacturer>Generic Angledrive</Manufacturer> <Model>Generic Angledrive Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Angledrive> <Axlegear> - <Data xsi:type="AxlegearDataPIFType"> + <Data xsi:type="AxlegearDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck AxleGear</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Axlegear> <AxleWheels > - <Data xsi:type="AxleWheelsDataPIFType"> + <Data xsi:type="AxleWheelsDataVIFType"> <Axles> <Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType"> <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType> @@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </AxleWheels> <Auxiliaries> - <Data xsi:type="AuxiliaryDataPIFType"> + <Data xsi:type="AuxiliaryDataVIFType"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> @@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </ApplicationInformation> </Data> <Signature> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> @@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <ManufacturingStep stepCount="2"> <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStep> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml index cbc4aed54e46c48e10e12cf6d36f976d9f872c45..4ab9b87ac9b4686569f0d18315450be0d9363048 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml @@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd"> <PrimaryVehicle> <Data id="text" xsi:type="PrimaryVehicleDataType"> - <Vehicle xsi:type="VehiclePIFType"> + <Vehicle xsi:type="ConventionalVehicleVIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> @@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </TorqueLimits> <Components xsi:type="Vehicle_Conventional_ComponentsVIFType"> <Engine> - <Data xsi:type="EngineDataPIFType"> + <Data xsi:type="EngineDataVIFType"> <Manufacturer>Generic Engine Manufacturer</Manufacturer> <Model>Bus 6x2</Model> <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> @@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Engine> <Transmission> - <Data xsi:type="TransmissionDataPIFType"> + <Data xsi:type="TransmissionDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck Gearbox</Model> <MainCertificationMethod>Standard values</MainCertificationMethod> @@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> <TransmissionType>AMT</TransmissionType> - <Gears xsi:type="TransmissionGearsPIFType"> + <Gears xsi:type="TransmissionGearsVIFType"> <Gear number="1"> <Ratio>14.930</Ratio> <MaxTorque>1900</MaxTorque> @@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Transmission> <TorqueConverter> - <Data xsi:type="TorqueConverterDataPIFType"> + <Data xsi:type="TorqueConverterDataVIFType"> <Manufacturer>Generic Torque Converter</Manufacturer> <Model>Generic Torque Converter Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </TorqueConverter> <Angledrive> - <Data xsi:type="AngledriveDataPIFType"> + <Data xsi:type="AngledriveDataVIFType"> <Manufacturer>Generic Angledrive</Manufacturer> <Model>Generic Angledrive Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Angledrive> <Axlegear> - <Data xsi:type="AxlegearDataPIFType"> + <Data xsi:type="AxlegearDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck AxleGear</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Axlegear> <AxleWheels> - <Data xsi:type="AxleWheelsDataPIFType"> + <Data xsi:type="AxleWheelsDataVIFType"> <Axles> <Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType"> <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType> @@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </AxleWheels> <Auxiliaries> - <Data xsi:type="AuxiliaryDataPIFType"> + <Data xsi:type="AuxiliaryDataVIFType"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> @@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </ApplicationInformation> </Data> <Signature> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> @@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <ManufacturingStep stepCount="2"> <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStep> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml index bb9b3da3a9db22e93dd4bbd2d8bfc03466d3d508..34d30f0a04b600bb337d0169c4e25ad00cf2f104 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml @@ -8,7 +8,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"> <PrimaryVehicle> <Data id="VEH-622a60d3b3cf4340a362" xsi:type="PrimaryVehicleDataType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"> - <Vehicle xsi:type="VehiclePIFType"> + <Vehicle xsi:type="ConventionalConventionalVehicleVIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> @@ -37,7 +37,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </vif0.1:TorqueLimits> <Components xsi:type="Vehicle_Conventional_ComponentsVIFType"> <Engine> - <Data xsi:type="EngineDataPIFType"> + <Data xsi:type="EngineDataVIFType"> <Manufacturer>Generic Engine Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck Engine</Model> <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> @@ -73,14 +73,14 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Engine> <Transmission> - <Data xsi:type="TransmissionDataPIFType"> + <Data xsi:type="TransmissionDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck Gearbox</Model> <MainCertificationMethod>Standard values</MainCertificationMethod> <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> <TransmissionType>AMT</TransmissionType> - <Gears xsi:type="TransmissionGearsPIFType"> + <Gears xsi:type="TransmissionGearsVIFType"> <Gear number="1"> <Ratio>14.930</Ratio> <MaxTorque>1900</MaxTorque> @@ -134,7 +134,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Transmission> <Axlegear> - <Data xsi:type="AxlegearDataPIFType"> + <Data xsi:type="AxlegearDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck AxleGear</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -145,7 +145,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Axlegear> <AxleWheels> - <Data xsi:type="AxleWheelsDataPIFType"> + <Data xsi:type="AxleWheelsDataVIFType"> <Axles> <Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType"> <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType> @@ -205,7 +205,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </AxleWheels> <Auxiliaries> - <Data xsi:type="AuxiliaryDataPIFType"> + <Data xsi:type="AuxiliaryDataVIFType"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml index 02f8cea034d3f303981c9c1edfe878d458d17b33..7b30f3e6d5b3a9cceee45b2df3ec581a242c6f00 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml @@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd"> <PrimaryVehicle> <Data id="text" xsi:type="PrimaryVehicleDataType"> - <Vehicle xsi:type="VehiclePIFType"> + <Vehicle xsi:type="ConventionalVehicleVIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> @@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </TorqueLimits> <Components xsi:type="Vehicle_Conventional_ComponentsVIFType"> <Engine> - <Data xsi:type="EngineDataPIFType"> + <Data xsi:type="EngineDataVIFType"> <Manufacturer>Generic Engine Manufacturer</Manufacturer> <Model>Bus 6x2</Model> <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> @@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Engine> <Transmission> - <Data xsi:type="TransmissionDataPIFType"> + <Data xsi:type="TransmissionDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck Gearbox</Model> <MainCertificationMethod>Standard values</MainCertificationMethod> @@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> <TransmissionType>AMT</TransmissionType> - <Gears xsi:type="TransmissionGearsPIFType"> + <Gears xsi:type="TransmissionGearsVIFType"> <Gear number="1"> <Ratio>14.930</Ratio> <MaxTorque>1900</MaxTorque> @@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Transmission> <TorqueConverter> - <Data xsi:type="TorqueConverterDataPIFType"> + <Data xsi:type="TorqueConverterDataVIFType"> <Manufacturer>Generic Torque Converter</Manufacturer> <Model>Generic Torque Converter Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </TorqueConverter> <Angledrive> - <Data xsi:type="AngledriveDataPIFType"> + <Data xsi:type="AngledriveDataVIFType"> <Manufacturer>Generic Angledrive</Manufacturer> <Model>Generic Angledrive Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Angledrive> <Axlegear> - <Data xsi:type="AxlegearDataPIFType"> + <Data xsi:type="AxlegearDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck AxleGear</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Axlegear> <AxleWheels> - <Data xsi:type="AxleWheelsDataPIFType"> + <Data xsi:type="AxleWheelsDataVIFType"> <Axles> <Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType"> <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType> @@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </AxleWheels> <Auxiliaries> - <Data xsi:type="AuxiliaryDataPIFType"> + <Data xsi:type="AuxiliaryDataVIFType"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> @@ -644,7 +644,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </ApplicationInformation> </Data> <Signature> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml index 6d9d45a69c24fcee9cdda5f95ae46da439a7226b..ec705312d43ca181a823e15228a03245c68fb2d8 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml @@ -10,7 +10,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd"> <PrimaryVehicle> <Data id="text" xsi:type="PrimaryVehicleDataType"> - <Vehicle xsi:type="VehiclePIFType"> + <Vehicle xsi:type="ConventionalVehicleVIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> @@ -40,7 +40,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </TorqueLimits> <Components xsi:type="Vehicle_Conventional_ComponentsVIFType"> <Engine> - <Data xsi:type="EngineDataPIFType"> + <Data xsi:type="EngineDataVIFType"> <Manufacturer>Generic Engine Manufacturer</Manufacturer> <Model>Bus 6x2</Model> <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> @@ -76,7 +76,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Engine> <Transmission> - <Data xsi:type="TransmissionDataPIFType"> + <Data xsi:type="TransmissionDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck Gearbox</Model> <MainCertificationMethod>Standard values</MainCertificationMethod> @@ -84,7 +84,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> <TransmissionType>AMT</TransmissionType> - <Gears xsi:type="TransmissionGearsPIFType"> + <Gears xsi:type="TransmissionGearsVIFType"> <Gear number="1"> <Ratio>14.930</Ratio> <MaxTorque>1900</MaxTorque> @@ -138,7 +138,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Transmission> <TorqueConverter> - <Data xsi:type="TorqueConverterDataPIFType"> + <Data xsi:type="TorqueConverterDataVIFType"> <Manufacturer>Generic Torque Converter</Manufacturer> <Model>Generic Torque Converter Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -153,7 +153,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </TorqueConverter> <Angledrive> - <Data xsi:type="AngledriveDataPIFType"> + <Data xsi:type="AngledriveDataVIFType"> <Manufacturer>Generic Angledrive</Manufacturer> <Model>Generic Angledrive Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -164,7 +164,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Angledrive> <Axlegear> - <Data xsi:type="AxlegearDataPIFType"> + <Data xsi:type="AxlegearDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck AxleGear</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -176,7 +176,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Axlegear> <AxleWheels> - <Data xsi:type="AxleWheelsDataPIFType"> + <Data xsi:type="AxleWheelsDataVIFType"> <Axles> <Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType"> <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType> @@ -263,7 +263,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </AxleWheels> <Auxiliaries> - <Data xsi:type="AuxiliaryDataPIFType"> + <Data xsi:type="AuxiliaryDataVIFType"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> @@ -629,7 +629,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </ApplicationInformation> </Data> <Signature> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> @@ -642,7 +642,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <ManufacturingStep stepCount="2"> <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStep> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml index 1c107e6352069c520194dbe5dfeb619d0172ff94..cea4aaff46cca79892c80c5ebc25822867693fb7 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml @@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd"> <PrimaryVehicle> <Data id="text" xsi:type="PrimaryVehicleDataType"> - <Vehicle xsi:type="VehiclePIFType"> + <Vehicle xsi:type="ConventionalVehicleVIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> @@ -40,7 +40,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </TorqueLimits> <Components xsi:type="Vehicle_Conventional_ComponentsVIFType"> <Engine> - <Data xsi:type="EngineDataPIFType"> + <Data xsi:type="EngineDataVIFType"> <Manufacturer>Generic Engine Manufacturer</Manufacturer> <Model>Generic primary bus 41 Engine</Model> <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> @@ -78,14 +78,14 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Engine> <Transmission> - <Data xsi:type="TransmissionDataPIFType"> + <Data xsi:type="TransmissionDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>AT 6 Gear</Model> <MainCertificationMethod>Standard values</MainCertificationMethod> <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> <TransmissionType>APT-S</TransmissionType> - <Gears xsi:type="TransmissionGearsPIFType"> + <Gears xsi:type="TransmissionGearsVIFType"> <Gear number="1"> <Ratio>3.364</Ratio> <MaxTorque>1900</MaxTorque> @@ -116,7 +116,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Transmission> <Axlegear> - <Data xsi:type="AxlegearDataPIFType"> + <Data xsi:type="AxlegearDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic primary bus 41 AxleGear</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -127,7 +127,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Axlegear> <AxleWheels> - <Data xsi:type="AxleWheelsDataPIFType"> + <Data xsi:type="AxleWheelsDataVIFType"> <Axles> <Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType"> <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType> @@ -187,7 +187,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </AxleWheels> <Auxiliaries> - <Data xsi:type="AuxiliaryDataPIFType"> + <Data xsi:type="AuxiliaryDataVIFType"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> @@ -564,7 +564,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </ApplicationInformation> </Data> <Signature> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> @@ -577,7 +577,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <ManufacturingStep stepCount="2"> <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStep> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml index 059e53b2bc710e18e7043e3164a4b0fb6055f07a..923b07c1e393f28822d6a87084deaa430be5000e 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml @@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd"> <PrimaryVehicle> <Data id="text" xsi:type="PrimaryVehicleDataType"> - <Vehicle xsi:type="VehiclePIFType"> + <Vehicle xsi:type="ConventionalVehicleVIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> @@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </TorqueLimits> <Components xsi:type="Vehicle_Conventional_ComponentsVIFType"> <Engine> - <Data xsi:type="EngineDataPIFType"> + <Data xsi:type="EngineDataVIFType"> <Manufacturer>Generic Engine Manufacturer</Manufacturer> <Model>Bus 6x2</Model> <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> @@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Engine> <Transmission> - <Data xsi:type="TransmissionDataPIFType"> + <Data xsi:type="TransmissionDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck Gearbox</Model> <MainCertificationMethod>Standard values</MainCertificationMethod> @@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> <TransmissionType>AMT</TransmissionType> - <Gears xsi:type="TransmissionGearsPIFType"> + <Gears xsi:type="TransmissionGearsVIFType"> <Gear number="1"> <Ratio>14.930</Ratio> <MaxTorque>1900</MaxTorque> @@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Transmission> <TorqueConverter> - <Data xsi:type="TorqueConverterDataPIFType"> + <Data xsi:type="TorqueConverterDataVIFType"> <Manufacturer>Generic Torque Converter</Manufacturer> <Model>Generic Torque Converter Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </TorqueConverter> <Angledrive> - <Data xsi:type="AngledriveDataPIFType"> + <Data xsi:type="AngledriveDataVIFType"> <Manufacturer>Generic Angledrive</Manufacturer> <Model>Generic Angledrive Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Angledrive> <Axlegear> - <Data xsi:type="AxlegearDataPIFType"> + <Data xsi:type="AxlegearDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck AxleGear</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Axlegear> <AxleWheels> - <Data xsi:type="AxleWheelsDataPIFType"> + <Data xsi:type="AxleWheelsDataVIFType"> <Axles> <Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType"> <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType> @@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </AxleWheels> <Auxiliaries> - <Data xsi:type="AuxiliaryDataPIFType"> + <Data xsi:type="AuxiliaryDataVIFType"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> @@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </ApplicationInformation> </Data> <Signature> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> @@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <ManufacturingStep stepCount="2"> <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStep> - <di:Reference URI="#PIF-d11aff76c5d149948046"> + <di:Reference URI="#VIF-d11aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml index 8de5353110b14b9792122fa12aebb6dc90498ba3..f81b15c5c14772d96643143e3d36efc9907ba754 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml @@ -11,7 +11,7 @@ xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd"> <PrimaryVehicle> <Data id="text" xsi:type="PrimaryVehicleDataType"> - <Vehicle xsi:type="VehiclePIFType"> + <Vehicle xsi:type="ConventionalVehicleVIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> @@ -41,7 +41,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </TorqueLimits> <Components xsi:type="Vehicle_Conventional_ComponentsVIFType"> <Engine> - <Data xsi:type="EngineDataPIFType"> + <Data xsi:type="EngineDataVIFType"> <Manufacturer>Generic Engine Manufacturer</Manufacturer> <Model>Bus 6x2</Model> <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> @@ -77,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Engine> <Transmission> - <Data xsi:type="TransmissionDataPIFType"> + <Data xsi:type="TransmissionDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck Gearbox</Model> <MainCertificationMethod>Standard values</MainCertificationMethod> @@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> <TransmissionType>AMT</TransmissionType> - <Gears xsi:type="TransmissionGearsPIFType"> + <Gears xsi:type="TransmissionGearsVIFType"> <Gear number="1"> <Ratio>14.930</Ratio> <MaxTorque>1900</MaxTorque> @@ -139,7 +139,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Transmission> <TorqueConverter> - <Data xsi:type="TorqueConverterDataPIFType"> + <Data xsi:type="TorqueConverterDataVIFType"> <Manufacturer>Generic Torque Converter</Manufacturer> <Model>Generic Torque Converter Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -154,7 +154,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </TorqueConverter> <Angledrive> - <Data xsi:type="AngledriveDataPIFType"> + <Data xsi:type="AngledriveDataVIFType"> <Manufacturer>Generic Angledrive</Manufacturer> <Model>Generic Angledrive Model</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -165,7 +165,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Angledrive> <Axlegear> - <Data xsi:type="AxlegearDataPIFType"> + <Data xsi:type="AxlegearDataVIFType"> <Manufacturer>Generic Gearbox Manufacturer</Manufacturer> <Model>Generic 40t Long Haul Truck AxleGear</Model> <CertificationMethod>Standard values</CertificationMethod> @@ -177,7 +177,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </Axlegear> <AxleWheels > - <Data xsi:type="AxleWheelsDataPIFType"> + <Data xsi:type="AxleWheelsDataVIFType"> <Axles> <Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType"> <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType> @@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Data> </AxleWheels> <Auxiliaries> - <Data xsi:type="AuxiliaryDataPIFType"> + <Data xsi:type="AuxiliaryDataVIFType"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> @@ -630,7 +630,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </ApplicationInformation> </Data> <Signature> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> @@ -643,7 +643,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile <ManufacturingStep stepCount="2"> <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStep> - <di:Reference URI="#PIF-d10aff76c5d149948046"> + <di:Reference URI="#VIF-d10aff76c5d149948046"> <di:Transforms> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj index aecf95815c6f15207ea64afc0ea4d0ca7a8ed3d9..12a914221dadf80e88fda3851a786fd6dde38598 100644 --- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj +++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj @@ -9,13 +9,15 @@ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net6.0|AnyCPU'"> <DebugType>full</DebugType> </PropertyGroup> - + <PropertyGroup Condition="('$(Configuration)' == 'MockupRelease') Or ('$(Configuration)' == 'MockupDebug')"> + <DefineConstants>$(DefineConstants);MOCKUP</DefineConstants> + </PropertyGroup> <ItemGroup> <PackageReference Include="NUnit" Version="3.13.2" /> <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> - <PackageReference Include="Ninject" Version="3.3.5" /> + <PackageReference Include="Ninject" Version="3.3.6" /> <PackageReference Include="NLog" Version="4.7.13" /> </ItemGroup> @@ -34,15 +36,15 @@ </None> </ItemGroup> <Choose> - <When Condition="'$(Configuration)|$(Platform)'=='MockupDebug|AnyCPU'"> + <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch( + $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))"> <ItemGroup> - <ProjectReference Include="..\..\VectoMockup\VectoMockup\VectoMockup.csproj" /> + <ProjectReference Include="$(SolutionDir)\VectoMockup\VectoMockup\VectoMockup.csproj" /> </ItemGroup> - <PropertyGroup> + <!--<PropertyGroup> <DefineConstants>MOCKUP</DefineConstants> - </PropertyGroup> + </PropertyGroup>--> </When> </Choose> - </Project> \ No newline at end of file diff --git a/VectoMockup/VectoMockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs b/VectoMockup/VectoMockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs index 20bf24510e407be4d559362b742cc401fe777dc8..c506b333c7faacf263931ec6d8ac8d81220af5b6 100644 --- a/VectoMockup/VectoMockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs +++ b/VectoMockup/VectoMockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs @@ -23,7 +23,7 @@ namespace TUGraz.VectoMockup.Simulation.RundataFactories { public PrimaryBusMockupRunDataFactory(IDeclarationInputDataProvider dataProvider, IDeclarationReport report) : - base(dataProvider, report) + base(dataProvider, report, false) { } #region Overrides of AbstractDeclarationVectoRunDataFactory diff --git a/VectoMockup/VectoMockupTest/MockUpVectoTest.cs b/VectoMockup/VectoMockupTest/MockUpVectoTest.cs index 0a5e300a02922d8900c37e549fbcdd946f698841..8d39074132ace5757e9b2fc9e72d8ac5802f1822 100644 --- a/VectoMockup/VectoMockupTest/MockUpVectoTest.cs +++ b/VectoMockup/VectoMockupTest/MockUpVectoTest.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.ComponentModel.Design; using System.IO; using System.Xml; using System.Xml.Linq; @@ -91,6 +92,9 @@ namespace VectoMockupTest protected const string Conventional_InterimBus = @"TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_multiple_stages.xml"; + + protected const string Conventional_StageInput = + @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\vecto_vehicle-stage_input_full-sample.xml"; #endregion #region completed bus @@ -102,21 +106,30 @@ namespace VectoMockupTest private const string TestDataDir = "TestData\\"; - private const string CompletedDiesel = TestDataDir + "Multistage\\newVifCompletedConventional.vecto"; - private const string CompletedExempted = TestDataDir + "Multistage\\newVifExempted.vecto"; - private const string CompletedExemptedWithoutTPMLM = TestDataDir + "Multistage\\newVifExempted-noTPMLM.vecto"; - private string CompletedWithoutADAS = TestDataDir + "Multistage\\newVifCompletedConventional-noADAS.vecto"; + private const string CompletedDiesel = TestDataDir + "Integration\\Multistage\\newVifCompletedConventional.vecto"; + private const string CompletedExempted = TestDataDir + "Integration\\Multistage\\newVifExempted.vecto"; + private const string CompletedExemptedWithoutTPMLM = TestDataDir + "Integration\\Multistage\\newVifExempted-noTPMLM.vecto"; + private string CompletedWithoutADAS = TestDataDir + "Integration\\Multistage\\newVifCompletedConventional-noADAS.vecto"; + + + private const string InterimExempted = TestDataDir + "Integration\\Multistage\\newVifExemptedIncomplete.vecto"; + private const string InterimDiesel = TestDataDir + "Integration\\Multistage\\newVifInterimDiesel.vecto"; + + + #endregion + #region GroupTest - private const string InterimExempted = TestDataDir + "newVifExemptedIncomplete.vecto"; - private const string InterimDiesel = TestDataDir + "newVifInterimDiesel.vecto"; + private const string GroupTestDir = @"TestData\XML\XMLReaderDeclaration\GroupTest\"; + #endregion + [OneTimeSetUp] public void OneTimeSetup() { @@ -186,7 +199,7 @@ namespace VectoMockupTest _simulatorFactory = _simFactoryFactory.Factory(ExecutionMode.Declaration, inputProvider, fileWriter, null, null, true); - + Clearfiles(fileWriter); jobContainer.AddRuns(_simulatorFactory); jobContainer.Execute(false); jobContainer.WaitFinished(); @@ -197,6 +210,15 @@ namespace VectoMockupTest } [TestCase(Conventional_PrimaryBus, TestName = "ConventionalPrimaryBus")] + [TestCase(HEV_IEPC_S_PrimaryBus, TestName="HEV_IEPC_S_PrimaryBus")] + [TestCase(HEV_Px_IHPC_PrimaryBus, TestName="HEV_Px_PrimaryBus")] + [TestCase(HEV_S2_PrimaryBus, TestName="HEV_S2_PrimaryBus")] + [TestCase(HEV_S3_PrimaryBus, TestName = "HEV_S3_PrimaryBus")] + [TestCase(HEV_S4_PrimaryBus, TestName = "HEV_S4_PrimaryBus")] + [TestCase(PEV_E2_PrimaryBus, TestName="PEV_E2_PrimaryBus")] + [TestCase(PEV_E3_PrimaryBus, TestName = "PEV_E3_PrimaryBus")] + [TestCase(PEV_E4_PrimaryBus, TestName = "PEV_E4_PrimaryBus")] + [TestCase(PEV_IEPC_PrimaryBus, TestName="PEV_IEPC_PrimaryBus")] public void PrimaryBusMockupTest(string fileName, bool mockup = true) { var inputProvider = _inputDataReader.Create(fileName); @@ -211,27 +233,33 @@ namespace VectoMockupTest jobContainer.AddRuns(_simulatorFactory); jobContainer.Execute(false); jobContainer.WaitFinished(); - CheckFileExists(fileWriter, checkCif:false, checkVif:true); + CheckFileExists(fileWriter, checkCif:false, checkPrimaryReport:true); Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLPrimaryVehicleReportName), XsdPath), "VIF invalid" ); Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName), XsdPath), "MRF invalid"); } - [TestCase(Conventional_InterimBus, TestName = "ConventionalInterimBus")] - public void InterimBusMockupTest(string fileName) + + [TestCase(Conventional_InterimBus,Conventional_StageInput, TestName = "ConventionalInterimBus")] + public void InterimBusMockupTest(string vifInput, string stageInputFile) { //SimulatorFactory.MockUpRun = mockup; - var inputProvider = _inputDataReader.Create(fileName); - var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName); + var multistageBusInput = _inputDataReader.Create(vifInput) as IMultistageBusInputDataProvider; + Assert.NotNull(multistageBusInput); + + var stageInput = _inputDataReader.CreateDeclaration(stageInputFile); + var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, vifInput); var sumWriter = new SummaryDataContainer(fileWriter); var jobContainer = new JobContainer(sumWriter); - _simulatorFactory = - _simFactoryFactory.Factory(ExecutionMode.Declaration, inputProvider, fileWriter, null, null, true); + var inputData = new XMLDeclarationVIFInputData(multistageBusInput, stageInput.JobInputData.Vehicle); + _simulatorFactory = + _simFactoryFactory.Factory(ExecutionMode.Declaration, inputData, fileWriter, null, null, true); + Clearfiles(fileWriter); jobContainer.AddRuns(_simulatorFactory); jobContainer.Execute(false); jobContainer.WaitFinished(); - CheckFileExists(fileWriter, checkCif: false, checkVif: true); + CheckFileExists(fileWriter, checkMrf:false, checkCif: false, checkVif: true); } @@ -253,7 +281,7 @@ namespace VectoMockupTest _simulatorFactory = _simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true); - + Clearfiles(fileWriter); jobContainer.AddRuns(_simulatorFactory); jobContainer.Execute(false); jobContainer.WaitFinished(); @@ -270,11 +298,28 @@ namespace VectoMockupTest var input = JSONInputDataFactory.ReadJsonJob(fileName); _simulatorFactory = _simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true); - + Clearfiles(fileWriter); jobContainer.AddRuns(_simulatorFactory); jobContainer.Execute(false); jobContainer.WaitFinished(); CheckFileExists(fileWriter, checkCif: true, checkVif: false); + } + + [TestCase(InterimDiesel, TestName = "PrimaryAndInterim")] + public void PrimaryAndInterim(string fileName) + { + + var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName); + var sumWriter = new SummaryDataContainer(fileWriter); + var jobContainer = new JobContainer(sumWriter); + var input = JSONInputDataFactory.ReadJsonJob(fileName); + _simulatorFactory = + _simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true); + Clearfiles(fileWriter); + jobContainer.AddRuns(_simulatorFactory); + jobContainer.Execute(false); + jobContainer.WaitFinished(); + CheckFileExists(fileWriter, checkCif: false, checkVif: true, checkMrf:false, checkPrimaryMrf:true); @@ -285,22 +330,114 @@ namespace VectoMockupTest - private static void CheckFileExists(FileOutputWriter fileWriter, bool checkMrf = true, bool checkCif = true, bool checkVif = false) + private static void CheckFileExists(FileOutputWriter fileWriter, + bool checkMrf = true, + bool checkCif = true, + bool checkVif = false, + bool checkPrimaryMrf = false, + bool checkPrimaryReport = false) { if (checkCif && !File.Exists(fileWriter.XMLCustomerReportName)) { - TestContext.WriteLine(fileWriter.XMLCustomerReportName); + TestContext.WriteLine(fileWriter.XMLCustomerReportName + "Missing\n"); Assert.Fail(); } if (checkMrf && !File.Exists(fileWriter.XMLFullReportName)) { - TestContext.WriteLine(fileWriter.XMLFullReportName); + TestContext.WriteLine(fileWriter.XMLFullReportName + "Missing\n"); + Assert.Fail(); + } + + var primaryMrfPath = fileWriter.XMLFullReportName.Replace("RSLT_MANUFACTURER", "RSLT_MANUFACTURER_PRIMARY"); + if (checkPrimaryMrf && !File.Exists(primaryMrfPath)) { + TestContext.WriteLine(primaryMrfPath + "Missing\n"); + Assert.Fail(); + } + + + if (checkPrimaryReport && !File.Exists(fileWriter.XMLPrimaryVehicleReportName)) + { + TestContext.WriteLine(fileWriter.XMLPrimaryVehicleReportName + "Missing\n"); Assert.Fail(); } - if (checkVif && !File.Exists(fileWriter.XMLPrimaryVehicleReportName)) { - TestContext.WriteLine(fileWriter.XMLPrimaryVehicleReportName); + + if (checkVif && !File.Exists(fileWriter.XMLMultistageReportFileName)) { + TestContext.WriteLine(fileWriter.XMLMultistageReportFileName + "Missing\n"); Assert.Fail(); } + + + } + + [TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml", TestName="GroupClass1")] + [TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml",TestName="GroupClass9")] + [TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Tractor_4x2_vehicle-class-5_EURO6_2018.xml", TestName="GroupClass5")] + [TestCase(@"TestData/XML/XMLReaderDeclaration/GroupTest/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml", TestName="GroupClass16")] + public void GroupTest(string fileName, bool mockup = true) + { + + var inputProvider = _inputDataReader.Create(fileName); + var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName); + var sumWriter = new SummaryDataContainer(fileWriter); + var jobContainer = new JobContainer(sumWriter); + + _simulatorFactory = + _simFactoryFactory.Factory(ExecutionMode.Declaration, inputProvider, fileWriter, null, null, true); + Clearfiles(fileWriter); + jobContainer.AddRuns(_simulatorFactory); + jobContainer.Execute(false); + jobContainer.WaitFinished(); + + CheckFileExists(fileWriter); + Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName),XsdPath), "MRF invalid"); + Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLCustomerReportName),XsdPath), "CIF invalid"); + } + + [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/Tractor_4x2_vehicle-class-5_5_t_0.xml", TestName="Schema10Test1")] + [Ignore("Invalid combination for ecoroll")] + [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_vehicle-new_parameters-sample.xml",TestName="Schema10_new_parameters")] + [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/vecto_vehicle-sample_LNG.xml", TestName="Schema10_vehicle_sample_lng")] + public void Schema1_0_Test(string fileName, bool mockup = true) + { + + var inputProvider = _inputDataReader.Create(fileName); + var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName); + var sumWriter = new SummaryDataContainer(fileWriter); + var jobContainer = new JobContainer(sumWriter); + + _simulatorFactory = + _simFactoryFactory.Factory(ExecutionMode.Declaration, inputProvider, fileWriter, null, null, true); + Clearfiles(fileWriter); + jobContainer.AddRuns(_simulatorFactory); + jobContainer.Execute(false); + jobContainer.WaitFinished(); + + CheckFileExists(fileWriter); + Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName),XsdPath), "MRF invalid"); + Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLCustomerReportName),XsdPath), "CIF invalid"); + } + + [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/Tractor_4x2_vehicle-class-5_5_t_0.xml", TestName="Schema20Test1")] + // [TestCase(@"", TestName="")] + // [TestCase(@"", TestName="")] + public void Schema2_0_Test(string fileName, bool mockup = true) + { + + var inputProvider = _inputDataReader.Create(fileName); + var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName); + var sumWriter = new SummaryDataContainer(fileWriter); + var jobContainer = new JobContainer(sumWriter); + + _simulatorFactory = + _simFactoryFactory.Factory(ExecutionMode.Declaration, inputProvider, fileWriter, null, null, true); + Clearfiles(fileWriter); + jobContainer.AddRuns(_simulatorFactory); + jobContainer.Execute(false); + jobContainer.WaitFinished(); + + CheckFileExists(fileWriter); + Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName),XsdPath), "MRF invalid"); + Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLCustomerReportName),XsdPath), "CIF invalid"); } } } diff --git a/VectoMockup/VectoMockupTest/VectoMockupTest.csproj b/VectoMockup/VectoMockupTest/VectoMockupTest.csproj index 1047c86b2b76e8e1b627518a9b5de252df125302..1ee851b0f98a115eceb705ee4bcc403ea7569ec4 100644 --- a/VectoMockup/VectoMockupTest/VectoMockupTest.csproj +++ b/VectoMockup/VectoMockupTest/VectoMockupTest.csproj @@ -1,5 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> <TargetFramework>net6.0</TargetFramework> <Nullable>enable</Nullable> @@ -24,17 +25,25 @@ </PropertyGroup> <ItemGroup> - <Content Include="..\..\VectoCore\VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\vecto_vehicle-primary_heavyBus-sample.xml" Link="TestData\vecto_vehicle-primary_heavyBus-sample.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> - <Content Include="..\..\VectoCore\VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\vecto_vehicle-stage_input_full-sample-final-noADAS.xml" Link="TestData\vecto_vehicle-stage_input_full-sample-final-noADAS.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> - <Content Include="..\..\VectoCore\VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\vecto_vehicle-stage_input_full-sample.xml" Link="TestData\vecto_vehicle-stage_input_full-sample.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> + <Compile Remove="TestData\**" /> + <EmbeddedResource Remove="TestData\**" /> + <None Remove="TestData\**" /> </ItemGroup> + <ItemGroup> + <Content Include="..\..\VectoCore\VectoCoreTest\TestData\**\*.*"> + + <Link>TestData\%(RecursiveDir)%(FileName).%(Extension)</Link> + + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + + </Content> + </ItemGroup> + + <ItemGroup> + <Content Remove="..\..\VectoCore\VectoCoreTest\TestData\Components\**" /> + </ItemGroup> + <ItemGroup> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" /> <PackageReference Include="NUnit" Version="3.13.3" /> @@ -43,35 +52,10 @@ <PackageReference Include="coverlet.collector" Version="3.1.2" /> </ItemGroup> - <ItemGroup> - <None Include="..\..\VectoCore\VectoCoreTest\TestData\Integration\Multistage\newVifCompletedConventional-noADAS.vecto" Link="TestData\Multistage\newVifCompletedConventional-noADAS.vecto"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\VectoCore\VectoCoreTest\TestData\Integration\Multistage\newVifCompletedConventional.vecto" Link="TestData\Multistage\newVifCompletedConventional.vecto"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\VectoCore\VectoCoreTest\TestData\Integration\Multistage\newVifExempted-noTPMLM.vecto" Link="TestData\Multistage\newVifExempted-noTPMLM.vecto"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\VectoCore\VectoCoreTest\TestData\Integration\Multistage\newVifExempted.vecto" Link="TestData\Multistage\newVifExempted.vecto"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\VectoCore\VectoCoreTest\TestData\Integration\Multistage\newVifExemptedIncomplete.vecto" Link="TestData\Multistage\newVifExemptedIncomplete.vecto"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\VectoCore\VectoCoreTest\TestData\Integration\Multistage\newVifInterimDiesel.vecto" Link="TestData\Multistage\newVifInterimDiesel.vecto"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - </ItemGroup> - <ItemGroup> <ProjectReference Include="..\..\VectoCore\VectoCoreTest\VectoCoreTest.csproj" /> <ProjectReference Include="..\..\VectoCore\VectoCore\VectoCore.csproj" /> <ProjectReference Include="..\VectoMockup\VectoMockup.csproj" /> </ItemGroup> - <ItemGroup> - <Folder Include="TestData\Multistage\" /> - </ItemGroup> - </Project>