Merge branch 'develop' into internal/bussimulations_Roeck
# Conflicts: # VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
No related branches found
No related tags found
Showing
- VECTO.sln.DotSettings 25 additions, 31 deletionsVECTO.sln.DotSettings
- VECTO/GUI/MainForm.Designer.vb 0 additions, 91 deletionsVECTO/GUI/MainForm.Designer.vb
- VECTO/GUI/MainForm.vb 3 additions, 2 deletionsVECTO/GUI/MainForm.vb
- VectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs 28 additions, 13 deletionsVectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs
- VectoCommon/VectoCommon/Utils/EnumHelper.cs 11 additions, 9 deletionsVectoCommon/VectoCommon/Utils/EnumHelper.cs
- VectoCommon/VectoCommon/Utils/EnumerableExtensionMethods.cs 151 additions, 55 deletionsVectoCommon/VectoCommon/Utils/EnumerableExtensionMethods.cs
- VectoCommon/VectoCommon/Utils/SI.cs 17 additions, 11 deletionsVectoCommon/VectoCommon/Utils/SI.cs
- VectoCommon/VectoCommon/Utils/SIConvertExtensionMethods.cs 2 additions, 2 deletionsVectoCommon/VectoCommon/Utils/SIConvertExtensionMethods.cs
- VectoCommon/VectoCommon/Utils/SIUtils.cs 12 additions, 23 deletionsVectoCommon/VectoCommon/Utils/SIUtils.cs
- VectoCommon/VectoCommon/Utils/StringExtensionMethods.cs 6 additions, 0 deletionsVectoCommon/VectoCommon/Utils/StringExtensionMethods.cs
- VectoCommon/VectoCommon/Utils/VectoMath.cs 94 additions, 209 deletionsVectoCommon/VectoCommon/Utils/VectoMath.cs
- VectoCommon/VectoCommon/VectoCommon.csproj 3 additions, 0 deletionsVectoCommon/VectoCommon/VectoCommon.csproj
- VectoCommon/VectoCommon/packages.config 1 addition, 0 deletionsVectoCommon/VectoCommon/packages.config
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs 2 additions, 2 deletionsVectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs 10 additions, 14 deletionsVectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs 5 additions, 6 deletions...e/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs 3 additions, 3 deletions...oCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs 0 additions, 3 deletionsVectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs 1 addition, 1 deletion.../DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs 2 additions, 2 deletions...ration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
Loading
Please register or sign in to comment