diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf
index e9fb391957a2ad2d18649a2fb17daba26ce30418..31841faf8a3a2efdb307695d6ef2186ff7f042c1 100644
Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf and b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf differ
diff --git a/VECTO.sln b/VECTO.sln
index cdc2fed5e6dfbbc2cf61f6eaae1c7250f583b603..a18e2401f48a34ad0ff757b675a5ae8bb7fcb62b 100644
--- a/VECTO.sln
+++ b/VECTO.sln
@@ -101,12 +101,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VECTOMultistage", "Tools\VE
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VectoMockup", "VectoMockup", "{927F1B17-8075-4185-A324-92971D2FB020}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VectoMockup", "VectoMockup\VectoMockup\VectoMockup.csproj", "{8E8F5C65-501E-4AAC-97DE-10DD283883D2}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VectoMockupTest", "VectoMockup\VectoMockupTest\VectoMockupTest.csproj", "{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}"
- ProjectSection(ProjectDependencies) = postProject
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2} = {8E8F5C65-501E-4AAC-97DE-10DD283883D2}
- EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -390,17 +385,6 @@ Global
{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}.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
@@ -432,7 +416,6 @@ Global
{083F6B3C-9529-448F-AF1D-D0889852B918} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
{4977BE2A-CB80-4FC0-8D1A-30EC094011B4} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2} = {927F1B17-8075-4185-A324-92971D2FB020}
{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88} = {927F1B17-8075-4185-A324-92971D2FB020}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index be55af27d43b130263c978a615c569a771b6187d..b41733958fc68076bc76b1189f81de0d71dd4cd1 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -66,17 +66,17 @@
</PackageReference>
</ItemGroup>
- <Choose>
+ <!--<Choose>
<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>
+ </Choose>-->
<ItemGroup>
<ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj" />
diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj
index c76a66d831042dcae4217c022a706c1a0b22f757..f0aae7fcd3b96d02bd22c79015c7181e39f7e928 100644
--- a/VECTO3GUI2020/VECTO3GUI2020.csproj
+++ b/VECTO3GUI2020/VECTO3GUI2020.csproj
@@ -42,13 +42,13 @@
<ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
</ItemGroup>
- <Choose>
+ <!--<Choose>
<When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
 $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup>
<ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
</ItemGroup>
</When>
- </Choose>
+ </Choose>-->
diff --git a/VectoConsole/VectoConsole.csproj b/VectoConsole/VectoConsole.csproj
index 1fab91cd911dcc6e336d49fc0e56324ea8feb2c1..d7059152b545466ce8b4fc84fea9a24ea0a8d0c0 100644
--- a/VectoConsole/VectoConsole.csproj
+++ b/VectoConsole/VectoConsole.csproj
@@ -41,15 +41,15 @@
<ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
</ItemGroup>
- <Choose>
+ <!--<Choose>
<When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
 $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup>
<ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
</ItemGroup>
- <!--<PropertyGroup>
+ --><!--<PropertyGroup>
<DefineConstants>MOCKUP</DefineConstants>
- </PropertyGroup>-->
+ </PropertyGroup>--><!--
</When>
- </Choose>
+ </Choose>-->
</Project>
\ No newline at end of file
diff --git a/VectoMockup/VectoMockup/MockupModalDataContainer.cs b/VectoCore/VectoCore/Mockup/MockupModalDataContainer.cs
similarity index 100%
rename from VectoMockup/VectoMockup/MockupModalDataContainer.cs
rename to VectoCore/VectoCore/Mockup/MockupModalDataContainer.cs
diff --git a/VectoMockup/VectoMockup/MockupResultReader.cs b/VectoCore/VectoCore/Mockup/MockupResultReader.cs
similarity index 99%
rename from VectoMockup/VectoMockup/MockupResultReader.cs
rename to VectoCore/VectoCore/Mockup/MockupResultReader.cs
index 4d235350a16ece3472c173742ea53a6fb6ecbd78..a627fca60f03d15b3e30078e41fc9bd615a0fd9c 100644
--- a/VectoMockup/VectoMockup/MockupResultReader.cs
+++ b/VectoCore/VectoCore/Mockup/MockupResultReader.cs
@@ -32,7 +32,7 @@ namespace TUGraz.VectoMockup
private static class MockupResultHelper
{
private static string _convArch = "Conv";
- private const string mockupResourcePrefix = "TUGraz.VectoMockup.MockupResults";
+ private const string mockupResourcePrefix = "TUGraz.VectoCore.Mockup.MockupResults";
private static HashSet<string> conventional = new HashSet<string>() {
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_Conv_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_Conv_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_Conv_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_Conv_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_Conv_Lorry.xml b/VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_Conv_Lorry.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_Conv_Lorry.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_Conv_Lorry.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml b/VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_PEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_PEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_PEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_PEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_PEV_Lorry.xml b/VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_PEV_Lorry.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_PEV_Lorry.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_PEV_Lorry.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml b/VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_Conv_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_Conv_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Error.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_Error.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Error.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_Error.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_PEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_PEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Lorry.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_PEV_Lorry.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Lorry.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_PEV_Lorry.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Lorry.xml b/VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Lorry.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Lorry.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Lorry.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_Conv_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/VIF_MockupResults_Conv_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_Conv_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/VIF_MockupResults_Conv_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_OVC-HEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/VIF_MockupResults_OVC-HEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_OVC-HEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/VIF_MockupResults_OVC-HEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_PEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/VIF_MockupResults_PEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_PEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/VIF_MockupResults_PEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_non-OVC-HEV_Bus.xml b/VectoCore/VectoCore/Mockup/MockupResults/VIF_MockupResults_non-OVC-HEV_Bus.xml
similarity index 100%
rename from VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_non-OVC-HEV_Bus.xml
rename to VectoCore/VectoCore/Mockup/MockupResults/VIF_MockupResults_non-OVC-HEV_Bus.xml
diff --git a/VectoMockup/VectoMockup/MockupXMLInputDataFactory.cs b/VectoCore/VectoCore/Mockup/MockupXMLInputDataFactory.cs
similarity index 100%
rename from VectoMockup/VectoMockup/MockupXMLInputDataFactory.cs
rename to VectoCore/VectoCore/Mockup/MockupXMLInputDataFactory.cs
diff --git a/VectoMockup/VectoMockup/Ninject/CIFMockupModule.cs b/VectoCore/VectoCore/Mockup/Ninject/CIFMockupModule.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Ninject/CIFMockupModule.cs
rename to VectoCore/VectoCore/Mockup/Ninject/CIFMockupModule.cs
diff --git a/VectoMockup/VectoMockup/Ninject/MRFMockupModule.cs b/VectoCore/VectoCore/Mockup/Ninject/MRFMockupModule.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Ninject/MRFMockupModule.cs
rename to VectoCore/VectoCore/Mockup/Ninject/MRFMockupModule.cs
diff --git a/VectoMockup/VectoMockup/Ninject/MockupModule.cs b/VectoCore/VectoCore/Mockup/Ninject/MockupModule.cs
similarity index 84%
rename from VectoMockup/VectoMockup/Ninject/MockupModule.cs
rename to VectoCore/VectoCore/Mockup/Ninject/MockupModule.cs
index cbc57cb97423faeaf92992ae5b6d106e4bd71cc1..993f9b86a244647771a1f4178153c0f05628f73f 100644
--- a/VectoMockup/VectoMockup/Ninject/MockupModule.cs
+++ b/VectoCore/VectoCore/Mockup/Ninject/MockupModule.cs
@@ -19,6 +19,11 @@ namespace TUGraz.VectoMockup.Ninject
public override void Load()
{
+ LoadModule<CIFMockupModule>();
+ LoadModule<MRFMockupModule>();
+ LoadModule<SimulatorFactoryModule>();
+ LoadModule<VIFMockupModule>();
+
Rebind<IVectoRunDataFactoryFactory>().To<VectoMockUpRunDataFactoryFactory>();
Rebind<IXMLDeclarationReportFactory>().To<MockupReportFactory>();
Rebind<IXMLInputDataReader>().To<MockupXMLInputDataFactory>();
diff --git a/VectoMockup/VectoMockup/Ninject/SimulatorFactoryModule.cs b/VectoCore/VectoCore/Mockup/Ninject/SimulatorFactoryModule.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Ninject/SimulatorFactoryModule.cs
rename to VectoCore/VectoCore/Mockup/Ninject/SimulatorFactoryModule.cs
diff --git a/VectoMockup/VectoMockup/Ninject/VIFMockupModule.cs b/VectoCore/VectoCore/Mockup/Ninject/VIFMockupModule.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Ninject/VIFMockupModule.cs
rename to VectoCore/VectoCore/Mockup/Ninject/VIFMockupModule.cs
diff --git a/VectoMockup/VectoMockup/Reports/IXMLMockupReport.cs b/VectoCore/VectoCore/Mockup/Reports/IXMLMockupReport.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/IXMLMockupReport.cs
rename to VectoCore/VectoCore/Mockup/Reports/IXMLMockupReport.cs
diff --git a/VectoMockup/VectoMockup/Reports/MockupCustomerReport.cs b/VectoCore/VectoCore/Mockup/Reports/MockupCustomerReport.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/MockupCustomerReport.cs
rename to VectoCore/VectoCore/Mockup/Reports/MockupCustomerReport.cs
diff --git a/VectoMockup/VectoMockup/Reports/MockupManufacturerReport.cs b/VectoCore/VectoCore/Mockup/Reports/MockupManufacturerReport.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/MockupManufacturerReport.cs
rename to VectoCore/VectoCore/Mockup/Reports/MockupManufacturerReport.cs
diff --git a/VectoMockup/VectoMockup/Reports/MockupReportFactory.cs b/VectoCore/VectoCore/Mockup/Reports/MockupReportFactory.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/MockupReportFactory.cs
rename to VectoCore/VectoCore/Mockup/Reports/MockupReportFactory.cs
diff --git a/VectoMockup/VectoMockup/Reports/MockupVIFReport.cs b/VectoCore/VectoCore/Mockup/Reports/MockupVIFReport.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/MockupVIFReport.cs
rename to VectoCore/VectoCore/Mockup/Reports/MockupVIFReport.cs
diff --git a/VectoMockup/VectoMockup/Reports/MockupVehicleInformationFile.cs b/VectoCore/VectoCore/Mockup/Reports/MockupVehicleInformationFile.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/MockupVehicleInformationFile.cs
rename to VectoCore/VectoCore/Mockup/Reports/MockupVehicleInformationFile.cs
diff --git a/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupPrimaryReport.cs b/VectoCore/VectoCore/Mockup/Reports/XMLDeclarationMockupPrimaryReport.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/XMLDeclarationMockupPrimaryReport.cs
rename to VectoCore/VectoCore/Mockup/Reports/XMLDeclarationMockupPrimaryReport.cs
diff --git a/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupReport.cs b/VectoCore/VectoCore/Mockup/Reports/XMLDeclarationMockupReport.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/XMLDeclarationMockupReport.cs
rename to VectoCore/VectoCore/Mockup/Reports/XMLDeclarationMockupReport.cs
diff --git a/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupReportCompletedVehicle.cs b/VectoCore/VectoCore/Mockup/Reports/XMLDeclarationMockupReportCompletedVehicle.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Reports/XMLDeclarationMockupReportCompletedVehicle.cs
rename to VectoCore/VectoCore/Mockup/Reports/XMLDeclarationMockupReportCompletedVehicle.cs
diff --git a/VectoMockup/VectoMockup/Simulation/MockupExemptedRun.cs b/VectoCore/VectoCore/Mockup/Simulation/MockupExemptedRun.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Simulation/MockupExemptedRun.cs
rename to VectoCore/VectoCore/Mockup/Simulation/MockupExemptedRun.cs
diff --git a/VectoMockup/VectoMockup/Simulation/MockupRun.cs b/VectoCore/VectoCore/Mockup/Simulation/MockupRun.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Simulation/MockupRun.cs
rename to VectoCore/VectoCore/Mockup/Simulation/MockupRun.cs
diff --git a/VectoMockup/VectoMockup/Simulation/RundataFactories/CompletedBusRunDataFactory.cs b/VectoCore/VectoCore/Mockup/Simulation/RundataFactories/CompletedBusRunDataFactory.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Simulation/RundataFactories/CompletedBusRunDataFactory.cs
rename to VectoCore/VectoCore/Mockup/Simulation/RundataFactories/CompletedBusRunDataFactory.cs
diff --git a/VectoMockup/VectoMockup/Simulation/RundataFactories/MockupLorryVectoRunDataFactory.cs b/VectoCore/VectoCore/Mockup/Simulation/RundataFactories/MockupLorryVectoRunDataFactory.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Simulation/RundataFactories/MockupLorryVectoRunDataFactory.cs
rename to VectoCore/VectoCore/Mockup/Simulation/RundataFactories/MockupLorryVectoRunDataFactory.cs
diff --git a/VectoMockup/VectoMockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs b/VectoCore/VectoCore/Mockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs
rename to VectoCore/VectoCore/Mockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs
diff --git a/VectoMockup/VectoMockup/Simulation/RundataFactories/VectoMockupRunDataFactoryFactory.cs b/VectoCore/VectoCore/Mockup/Simulation/RundataFactories/VectoMockupRunDataFactoryFactory.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Simulation/RundataFactories/VectoMockupRunDataFactoryFactory.cs
rename to VectoCore/VectoCore/Mockup/Simulation/RundataFactories/VectoMockupRunDataFactoryFactory.cs
diff --git a/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupFollowUpSimulatorFactoryCreator.cs b/VectoCore/VectoCore/Mockup/Simulation/SimulatorFactory/MockupFollowUpSimulatorFactoryCreator.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupFollowUpSimulatorFactoryCreator.cs
rename to VectoCore/VectoCore/Mockup/Simulation/SimulatorFactory/MockupFollowUpSimulatorFactoryCreator.cs
diff --git a/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs b/VectoCore/VectoCore/Mockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
similarity index 100%
rename from VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
rename to VectoCore/VectoCore/Mockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
diff --git a/VectoMockup/VectoMockup/VectoMockup.cs b/VectoCore/VectoCore/Mockup/VectoMockup.cs
similarity index 100%
rename from VectoMockup/VectoMockup/VectoMockup.cs
rename to VectoCore/VectoCore/Mockup/VectoMockup.cs
diff --git a/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs b/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
index 3ea6c57d0560151765e54711886ded5b7af82d18..4b27ed472de140c9e2d25b223d0ee9ea0f9b56df 100644
--- a/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
+++ b/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
@@ -45,6 +45,8 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.
using TUGraz.VectoCore.OutputData.XML.Engineering;
using TUGraz.VectoCore.OutputData.XML.GroupWriter;
+using TUGraz.VectoMockup.Ninject;
+
namespace TUGraz.VectoCore
{
public abstract class AbstractNinjectModule : NinjectModule
@@ -94,32 +96,11 @@ namespace TUGraz.VectoCore
LoadModule<MRFNinjectModule>();
LoadModule<CIFNinjectModule>();
LoadModule<VIFNinjectModule>();
-
-
-
-#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");
- Kernel.Load(new Assembly[]{assembly});
-
-
-
-
-
-
-#endif
-
-
-
-
+ #if (MOCKUP) //TODO: add second constant for release
+ LoadModule<MockupModule>();
+ #endif
}
-
-
-
-#endregion
-
-
+ #endregion
}
}
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 03aa0b455d9a33f2519fa07baf44f77e3370af97..a40ed06626318812b9b09516b278ba89ad4d51fc 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -29,29 +29,50 @@
<DebugType>none</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupRelease|net45|AnyCPU'">
- <DebugType>full</DebugType>
+ <!--<DebugType>full</DebugType>-->
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupRelease|net48|AnyCPU'">
- <DebugType>full</DebugType>
+ <!--<DebugType>full</DebugType>-->
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupRelease|net6.0|AnyCPU'">
- <DebugType>full</DebugType>
+ <!--<DebugType>full</DebugType>-->
</PropertyGroup>
- <Choose>
+ <!--<Choose>
<When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
 $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>VectoMockup</_Parameter1>
</AssemblyAttribute>
</ItemGroup>
- <!--<PropertyGroup>
+ --><!--<PropertyGroup>
<DefineConstants>MOCKUP</DefineConstants>
- </PropertyGroup>-->
+ </PropertyGroup>--><!--
</When>
- </Choose>
+ </Choose>-->
<ItemGroup>
+ <None Remove="Mockup\MockupResults\CIF_MockupResults_Conv_Bus.xml" />
+ <None Remove="Mockup\MockupResults\CIF_MockupResults_Conv_Lorry.xml" />
+ <None Remove="Mockup\MockupResults\CIF_MockupResults_non-OVC-HEV_Bus.xml" />
+ <None Remove="Mockup\MockupResults\CIF_MockupResults_non-OVC-HEV_Lorry.xml" />
+ <None Remove="Mockup\MockupResults\CIF_MockupResults_OVC-HEV_Bus.xml" />
+ <None Remove="Mockup\MockupResults\CIF_MockupResults_OVC-HEV_Lorry.xml" />
+ <None Remove="Mockup\MockupResults\CIF_MockupResults_PEV_Bus.xml" />
+ <None Remove="Mockup\MockupResults\CIF_MockupResults_PEV_Lorry.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_Conv_Bus.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_Conv_Lorry.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_Error.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_non-OVC-HEV_Bus.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_non-OVC-HEV_Lorry.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_OVC-HEV_Bus.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_OVC-HEV_Lorry.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_PEV_Bus.xml" />
+ <None Remove="Mockup\MockupResults\MRF_MockupResults_PEV_Lorry.xml" />
+ <None Remove="Mockup\MockupResults\VIF_MockupResults_Conv_Bus.xml" />
+ <None Remove="Mockup\MockupResults\VIF_MockupResults_non-OVC-HEV_Bus.xml" />
+ <None Remove="Mockup\MockupResults\VIF_MockupResults_OVC-HEV_Bus.xml" />
+ <None Remove="Mockup\MockupResults\VIF_MockupResults_PEV_Bus.xml" />
<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" />
@@ -120,6 +141,33 @@
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <!--<EmbeddedResource Include="Mockup\MockupResults">
+ <LogicalName>TUGraz.VectoMockup.MockupResults</LogicalName>
+ </EmbeddedResource>-->
+ <EmbeddedResource Include="Mockup\MockupResults\CIF_MockupResults_Conv_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\CIF_MockupResults_Conv_Lorry.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\CIF_MockupResults_non-OVC-HEV_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\CIF_MockupResults_non-OVC-HEV_Lorry.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\CIF_MockupResults_OVC-HEV_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\CIF_MockupResults_OVC-HEV_Lorry.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\CIF_MockupResults_PEV_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\CIF_MockupResults_PEV_Lorry.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_Conv_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_Conv_Lorry.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_Error.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_non-OVC-HEV_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_non-OVC-HEV_Lorry.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_OVC-HEV_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_OVC-HEV_Lorry.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_PEV_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\MRF_MockupResults_PEV_Lorry.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\VIF_MockupResults_Conv_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\VIF_MockupResults_non-OVC-HEV_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\VIF_MockupResults_OVC-HEV_Bus.xml" />
+ <EmbeddedResource Include="Mockup\MockupResults\VIF_MockupResults_PEV_Bus.xml" />
+ </ItemGroup>
+
<ItemGroup>
<Compile Update="JSONKeys.Designer.cs">
<DesignTime>True</DesignTime>
@@ -132,4 +180,8 @@
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <Folder Conidition="('$(Configuration)' == 'MockupRelease') Or ('$(Configuration)' == 'MockupDebug')" Include="Mockup\" />
+ </ItemGroup>
+
</Project>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 46de90a322530f97057969368805da66f716eed6..c0d07c6b1e67888f04aa03a53de60b68463c499e 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -35,15 +35,15 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
- <Choose>
+ <!--<Choose>
<When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
 $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup>
<ProjectReference Include="$(SolutionDir)\VectoMockup\VectoMockup\VectoMockup.csproj" />
</ItemGroup>
- <!--<PropertyGroup>
+ --><!--<PropertyGroup>
<DefineConstants>MOCKUP</DefineConstants>
- </PropertyGroup>-->
+ </PropertyGroup>--><!--
</When>
- </Choose>
+ </Choose>-->
</Project>
\ No newline at end of file
diff --git a/VectoMockup/VectoMockup/VectoMockup.csproj b/VectoMockup/VectoMockup/VectoMockup.csproj
deleted file mode 100644
index 63872dc5dadd1cc244f23f091d55d07d58643997..0000000000000000000000000000000000000000
--- a/VectoMockup/VectoMockup/VectoMockup.csproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
- <PropertyGroup>
- <RootNamespace>TUGraz.VectoMockup</RootNamespace>
- <AssemblyName>VectoMockup</AssemblyName>
- <TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
- <DefineConstants Condition="'$(Configuration)' == 'MockupDebug'">Debug</DefineConstants>
- <Configurations>Debug;Release;MockupDebug</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)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
- <DebugType>embedded</DebugType>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net48|AnyCPU'">
- <DebugType>embedded</DebugType>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
- <DebugType>embedded</DebugType>
- </PropertyGroup>
- <ItemGroup>
- <None Remove="MockupResults\CIF_MockupResults_Conv_Bus.xml" />
- <None Remove="MockupResults\CIF_MockupResults_Conv_Lorry.xml" />
- <None Remove="MockupResults\CIF_MockupResults_non-OVC-HEV_Bus.xml" />
- <None Remove="MockupResults\CIF_MockupResults_non-OVC-HEV_Lorry.xml" />
- <None Remove="MockupResults\CIF_MockupResults_OVC-HEV_Bus.xml" />
- <None Remove="MockupResults\CIF_MockupResults_OVC-HEV_Lorry.xml" />
- <None Remove="MockupResults\CIF_MockupResults_PEV_Bus.xml" />
- <None Remove="MockupResults\CIF_MockupResults_PEV_Lorry.xml" />
- <None Remove="MockupResults\MRF_MockupResults_Conv_Bus.xml" />
- <None Remove="MockupResults\MRF_MockupResults_Conv_Lorry.xml" />
- <None Remove="MockupResults\MRF_MockupResults_Error.xml" />
- <None Remove="MockupResults\MRF_MockupResults_non-OVC-HEV_Bus.xml" />
- <None Remove="MockupResults\MRF_MockupResults_non-OVC-HEV_Lorry.xml" />
- <None Remove="MockupResults\MRF_MockupResults_OVC-HEV_Bus.xml" />
- <None Remove="MockupResults\MRF_MockupResults_OVC-HEV_Lorry.xml" />
- <None Remove="MockupResults\MRF_MockupResults_PEV_Bus.xml" />
- <None Remove="MockupResults\MRF_MockupResults_PEV_Lorry.xml" />
- <None Remove="MockupResults\VIF_MockupResults_Conv_Bus.xml" />
- <None Remove="MockupResults\VIF_MockupResults_non-OVC-HEV_Bus.xml" />
- <None Remove="MockupResults\VIF_MockupResults_OVC-HEV_Bus.xml" />
- <None Remove="MockupResults\VIF_MockupResults_PEV_Bus.xml" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="MockupResults\CIF_MockupResults_Conv_Bus.xml" />
- <EmbeddedResource Include="MockupResults\CIF_MockupResults_Conv_Lorry.xml" />
- <EmbeddedResource Include="MockupResults\CIF_MockupResults_non-OVC-HEV_Bus.xml" />
- <EmbeddedResource Include="MockupResults\CIF_MockupResults_non-OVC-HEV_Lorry.xml" />
- <EmbeddedResource Include="MockupResults\CIF_MockupResults_OVC-HEV_Bus.xml" />
- <EmbeddedResource Include="MockupResults\CIF_MockupResults_OVC-HEV_Lorry.xml" />
- <EmbeddedResource Include="MockupResults\CIF_MockupResults_PEV_Bus.xml" />
- <EmbeddedResource Include="MockupResults\CIF_MockupResults_PEV_Lorry.xml" />
- <EmbeddedResource Include="MockupResults\MRF_MockupResults_Conv_Bus.xml" />
- <EmbeddedResource Include="MockupResults\MRF_MockupResults_Conv_Lorry.xml" />
- <EmbeddedResource Include="MockupResults\MRF_MockupResults_Error.xml" />
- <EmbeddedResource Include="MockupResults\MRF_MockupResults_non-OVC-HEV_Bus.xml" />
- <EmbeddedResource Include="MockupResults\MRF_MockupResults_non-OVC-HEV_Lorry.xml" />
- <EmbeddedResource Include="MockupResults\MRF_MockupResults_OVC-HEV_Bus.xml" />
- <EmbeddedResource Include="MockupResults\MRF_MockupResults_OVC-HEV_Lorry.xml" />
- <EmbeddedResource Include="MockupResults\MRF_MockupResults_PEV_Bus.xml" />
- <EmbeddedResource Include="MockupResults\MRF_MockupResults_PEV_Lorry.xml" />
- <EmbeddedResource Include="MockupResults\VIF_MockupResults_Conv_Bus.xml" />
- <EmbeddedResource Include="MockupResults\VIF_MockupResults_non-OVC-HEV_Bus.xml" />
- <EmbeddedResource Include="MockupResults\VIF_MockupResults_OVC-HEV_Bus.xml" />
- <EmbeddedResource Include="MockupResults\VIF_MockupResults_PEV_Bus.xml" />
- </ItemGroup>
- <ItemGroup>
- <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" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\VectoCore\VectoCore\VectoCore.csproj" />
- </ItemGroup>
-
-</Project>
diff --git a/VectoMockup/VectoMockupTest/VectoMockupTest.csproj b/VectoMockup/VectoMockupTest/VectoMockupTest.csproj
index 63a43fb3a2f8a5c2632eb177dd12a2addf312aee..5a089db20b7e61c84936b8360fb61da7e877240c 100644
--- a/VectoMockup/VectoMockupTest/VectoMockupTest.csproj
+++ b/VectoMockup/VectoMockupTest/VectoMockupTest.csproj
@@ -55,7 +55,6 @@
<ItemGroup>
<ProjectReference Include="..\..\VectoCore\VectoCoreTest\VectoCoreTest.csproj" />
<ProjectReference Include="..\..\VectoCore\VectoCore\VectoCore.csproj" />
- <ProjectReference Include="..\VectoMockup\VectoMockup.csproj" />
</ItemGroup>
</Project>