Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

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

merge develop, testcases green

parent eae6dd17
No related branches found
No related tags found
No related merge requests found
......@@ -5,8 +5,6 @@ VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VECTO", "VECTO\VECTO.vbproj", "{AAC0F132-0A9F-45B3-B682-77AC9B24B352}"
EndProject
Project("{F088123C-0E9E-452A-89E6-6BA2F21D5CAC}") = "VectoCoreArchitecture", "Documentation\VectoCoreArchitecture\VectoCoreArchitecture.modelproj", "{165DA769-0FC8-44A7-87D6-58D037E765AB}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VectoAuxiliaries", "VECTOAux\VectoAuxiliaries\VectoAuxiliaries.vbproj", "{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoCore", "VectoCore\VectoCore\VectoCore.csproj", "{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}"
......@@ -84,14 +82,6 @@ Global
{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Release|x64.ActiveCfg = Release|Any CPU
{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Release|x86.ActiveCfg = Release|x86
{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Release|x86.Build.0 = Release|x86
{165DA769-0FC8-44A7-87D6-58D037E765AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{165DA769-0FC8-44A7-87D6-58D037E765AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{165DA769-0FC8-44A7-87D6-58D037E765AB}.Debug|x64.ActiveCfg = Debug|Any CPU
{165DA769-0FC8-44A7-87D6-58D037E765AB}.Debug|x86.ActiveCfg = Debug|Any CPU
{165DA769-0FC8-44A7-87D6-58D037E765AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{165DA769-0FC8-44A7-87D6-58D037E765AB}.Release|Any CPU.Build.0 = Release|Any CPU
{165DA769-0FC8-44A7-87D6-58D037E765AB}.Release|x64.ActiveCfg = Release|Any CPU
{165DA769-0FC8-44A7-87D6-58D037E765AB}.Release|x86.ActiveCfg = Release|Any CPU
{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Debug|x64.ActiveCfg = Debug|Any CPU
......@@ -280,12 +270,12 @@ Global
{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
{E8B0B447-1A54-4BEC-A160-AF0017000781} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
{749F150A-F974-46DC-A1E2-F4153C54FC0D} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
{79A066AD-69A9-4223-90F6-6ED5D2D084F4} = {73A5BF70-6168-456F-95E5-A1402BFA488C}
{512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64} = {D29E62A2-CF08-469F-B29F-1B25DCB35386}
{D959CB7C-F514-4F5E-9C33-684D0012474B} = {D29E62A2-CF08-469F-B29F-1B25DCB35386}
{41314A40-AB3E-4F43-B1A4-58443F4014F2} = {D29E62A2-CF08-469F-B29F-1B25DCB35386}
{35FBDFEF-07E6-4E2C-8C18-4753266A6EDE} = {D29E62A2-CF08-469F-B29F-1B25DCB35386}
{749F150A-F974-46DC-A1E2-F4153C54FC0D} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
{9958E236-C4C6-49A2-A58D-EF9D646BA3C4} = {D29E62A2-CF08-469F-B29F-1B25DCB35386}
{CA0B0104-9FAC-4BE4-8CF6-F3C81A84189C} = {D29E62A2-CF08-469F-B29F-1B25DCB35386}
{A5B6F376-5AAA-453E-8102-B2BA59B83403} = {D29E62A2-CF08-469F-B29F-1B25DCB35386}
......
......@@ -277,10 +277,10 @@ Examples:
Environment.ExitCode = Environment.ExitCode != 0 ? Environment.ExitCode : 1;
}
//#if DEBUG
#if DEBUG
Console.WriteLine("done.");
Console.ReadKey();
//#endif
#endif
return Environment.ExitCode;
}
......
......@@ -325,6 +325,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var inputData = JSONInputDataFactory.ReadJsonJob(jobFile);
var runsFactory = new SimulatorFactory(ExecutionMode.Engineering, inputData, fileWriter);
runsFactory.ActualModalData = actualModData;
runsFactory.WriteModalResults = true;
jobContainer.AddRuns(runsFactory);
jobContainer.Execute();
......@@ -407,7 +408,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
RunJob(@"TestData\MeasuredSpeed\MeasuredSpeedGear.vecto",
@"TestData\MeasuredSpeed\Results\MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod",
@"TestData\MeasuredSpeed\MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod",
@"TestData\MeasuredSpeed\Results\MeasuredSpeedGear.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedGear.vsum", true);
@"TestData\MeasuredSpeed\Results\MeasuredSpeedGear.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedGear.vsum");
}
[TestMethod]
......@@ -417,7 +418,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
@"TestData\MeasuredSpeed\Results\MeasuredSpeedGear_TractionInterruption_MeasuredSpeed_Gear_Rural_TractionInterruption.vmod",
@"TestData\MeasuredSpeed\MeasuredSpeedGear_TractionInterruption_MeasuredSpeed_Gear_Rural_TractionInterruption.vmod",
@"TestData\MeasuredSpeed\Results\MeasuredSpeedGear_TractionInterruption.vsum",
@"TestData\MeasuredSpeed\MeasuredSpeedGear_TractionInterruption.vsum", true);
@"TestData\MeasuredSpeed\MeasuredSpeedGear_TractionInterruption.vsum");
}
[TestMethod]
......
<?xml version="1.0" encoding="utf-8"?>
<repositories>
<repository path="..\..\VECTO_API\Excel2XML\packages.config" />
<repository path="..\..\VECTO_API\VectoDB\packages.config" />
<repository path="..\VECTO\packages.config" />
<repository path="..\VECTOAux\VectoAuxiliaries\packages.config" />
<repository path="..\VECTOAux\VectoAuxiliariesTests\packages.config" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment