Corrections and Merge branch 'develop' into feature/VECTO-102-auxiliaries-identification
Conflicts: VectoCoreTest/Models/Declaration/DeclarationDataTest.cs VectoCoreTest/Utils/AssertHelper.cs
Showing
- VectoCore/FileIO/Reader/DataObjectAdaper/DeclarationDataAdapter.cs 1 addition, 1 deletion.../FileIO/Reader/DataObjectAdaper/DeclarationDataAdapter.cs
- VectoCore/FileIO/Reader/Impl/DeclarationModeSimulationDataReader.cs 4 additions, 2 deletions...FileIO/Reader/Impl/DeclarationModeSimulationDataReader.cs
- VectoCore/FileIO/Reader/Impl/EngineeringModeSimulationDataReader.cs 3 additions, 1 deletion...FileIO/Reader/Impl/EngineeringModeSimulationDataReader.cs
- VectoCore/Models/Declaration/Fan.cs 1 addition, 1 deletionVectoCore/Models/Declaration/Fan.cs
- VectoCore/Models/Declaration/Segments.cs 2 additions, 2 deletionsVectoCore/Models/Declaration/Segments.cs
- VectoCore/Models/Declaration/TorqueConverter.cs 1 addition, 1 deletionVectoCore/Models/Declaration/TorqueConverter.cs
- VectoCore/Models/Simulation/Data/ModalDataWriter.cs 22 additions, 13 deletionsVectoCore/Models/Simulation/Data/ModalDataWriter.cs
- VectoCore/Models/Simulation/Data/SummaryFileWriter.cs 10 additions, 8 deletionsVectoCore/Models/Simulation/Data/SummaryFileWriter.cs
- VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs 8 additions, 25 deletionsVectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
- VectoCore/Models/Simulation/Impl/SimulatorFactory.cs 4 additions, 8 deletionsVectoCore/Models/Simulation/Impl/SimulatorFactory.cs
- VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs 9 additions, 9 deletions...ls/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs
- VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs 2 additions, 2 deletions...els/SimulationComponent/Data/Engine/FuelConsumptionMap.cs
- VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs 1 addition, 1 deletion...oCore/Models/SimulationComponent/Impl/CombustionEngine.cs
- VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs 1 addition, 1 deletion...els/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
- VectoCore/Models/SimulationComponent/Impl/Driver.cs 1 addition, 1 deletionVectoCore/Models/SimulationComponent/Impl/Driver.cs
- VectoCore/Models/SimulationComponent/Impl/Vehicle.cs 4 additions, 4 deletionsVectoCore/Models/SimulationComponent/Impl/Vehicle.cs
- VectoCore/Utils/DoubleExtensionMethods.cs 10 additions, 9 deletionsVectoCore/Utils/DoubleExtensionMethods.cs
- VectoCore/Utils/IntExtensionMethods.cs 2 additions, 4 deletionsVectoCore/Utils/IntExtensionMethods.cs
- VectoCore/Utils/SI.cs 722 additions, 207 deletionsVectoCore/Utils/SI.cs
- VectoCore/Utils/VectoMath.cs 2 additions, 2 deletionsVectoCore/Utils/VectoMath.cs
Loading
Please register or sign in to comment