Merge remote-tracking branch 'vecto/develop' into feature/VECTO-318-update-steering-pumps
# Conflicts: # VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
No related branches found
No related tags found
Showing
- VECTO/Input Files/cGBX.vb 28 additions, 26 deletionsVECTO/Input Files/cGBX.vb
- VectoCommon/VectoCommon/InputData/DeclarationInputData.cs 5 additions, 17 deletionsVectoCommon/VectoCommon/InputData/DeclarationInputData.cs
- VectoCommon/VectoCommon/InputData/EngineeringInputData.cs 9 additions, 3 deletionsVectoCommon/VectoCommon/InputData/EngineeringInputData.cs
- VectoCommon/VectoCommon/Models/AuxiliaryType.cs 4 additions, 4 deletionsVectoCommon/VectoCommon/Models/AuxiliaryType.cs
- VectoCommon/VectoCommon/Utils/Validation.cs 20 additions, 4 deletionsVectoCommon/VectoCommon/Utils/Validation.cs
- VectoCommon/VectoCommon/VectoCommon.csproj 1 addition, 0 deletionsVectoCommon/VectoCommon/VectoCommon.csproj
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs 9 additions, 8 deletionsVectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
- VectoCore/VectoCore/InputData/Impl/InputData.cs 3 additions, 7 deletionsVectoCore/VectoCore/InputData/Impl/InputData.cs
- VectoCore/VectoCore/InputData/Reader/ComponentData/AuxiliaryDataReader.cs 105 additions, 0 deletions...ore/InputData/Reader/ComponentData/AuxiliaryDataReader.cs
- VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs 7 additions, 7 deletions...utData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
- VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs 5 additions, 9 deletions...utData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
- VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs 7 additions, 3 deletionsVectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
- VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs 1 addition, 1 deletion...Core/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
- VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs 11 additions, 99 deletions...ectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs
- VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs 15 additions, 3 deletions...els/SimulationComponent/Data/Engine/FuelConsumptionMap.cs
- VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs 2 additions, 1 deletion...s/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
- VectoCore/VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs 9 additions, 0 deletions...odels/SimulationComponent/Data/SimulationComponentData.cs
- VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs 5 additions, 1 deletion.../VectoCore/Models/SimulationComponent/Data/VehicleData.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs 7 additions, 7 deletions...oCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs 1 addition, 1 deletion.../Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
Loading
Please register or sign in to comment