Merge branch 'feature/VECTO-105-SimulationDataFactory' of...
Merge branch 'feature/VECTO-105-SimulationDataFactory' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into feature/VECTO-105-SimulationDataFactory Conflicts: VectoCore/FileIO/InputFileReader.cs VectoCore/FileIO/VehicleFileDeclaration.cs VectoCore/FileIO/VehicleFileEngineering.cs VectoCore/Models/Simulation/Impl/SimulatorFactory.cs VectoCore/Models/SimulationComponent/Data/VehicleData.cs VectoCore/Models/SimulationComponent/Factories/EngineeringModeFactory.cs VectoCore/VectoCore.csproj VectoCoreTest/Models/SimulationComponent/VehicleTest.cs VectoCoreTest/Models/SimulationComponent/WheelsTest.cs VectoCoreTest/Models/SimulationComponentData/VehicleDataTest.cs
No related branches found
No related tags found
Showing
- VECTO.sln.DotSettings 1 addition, 0 deletionsVECTO.sln.DotSettings
- VectoCore/Exceptions/VectoExceptions.cs 5 additions, 0 deletionsVectoCore/Exceptions/VectoExceptions.cs
- VectoCore/FileIO/InputFileReader.cs 15 additions, 4 deletionsVectoCore/FileIO/InputFileReader.cs
- VectoCore/FileIO/VehicleFileDeclaration.cs 129 additions, 0 deletionsVectoCore/FileIO/VehicleFileDeclaration.cs
- VectoCore/FileIO/VehicleFileEngineering.cs 128 additions, 0 deletionsVectoCore/FileIO/VehicleFileEngineering.cs
- VectoCore/Models/Declaration/Axle.cs 17 additions, 0 deletionsVectoCore/Models/Declaration/Axle.cs
- VectoCore/Models/Declaration/AxleConfiguration.cs 23 additions, 0 deletionsVectoCore/Models/Declaration/AxleConfiguration.cs
- VectoCore/Models/Declaration/Declaration.cs 9 additions, 9 deletionsVectoCore/Models/Declaration/Declaration.cs
- VectoCore/Models/Declaration/DeclarationData.cs 53 additions, 0 deletionsVectoCore/Models/Declaration/DeclarationData.cs
- VectoCore/Models/Declaration/DeclarationPT1.cs 47 additions, 0 deletionsVectoCore/Models/Declaration/DeclarationPT1.cs
- VectoCore/Models/Declaration/DeclarationSegments.cs 111 additions, 0 deletionsVectoCore/Models/Declaration/DeclarationSegments.cs
- VectoCore/Models/Declaration/DeclarationWheels.cs 4 additions, 14 deletionsVectoCore/Models/Declaration/DeclarationWheels.cs
- VectoCore/Models/Declaration/ElectricSystem.cs 49 additions, 0 deletionsVectoCore/Models/Declaration/ElectricSystem.cs
- VectoCore/Models/Declaration/LookupData.cs 39 additions, 11 deletionsVectoCore/Models/Declaration/LookupData.cs
- VectoCore/Models/Declaration/Mission.cs 27 additions, 0 deletionsVectoCore/Models/Declaration/Mission.cs
- VectoCore/Models/Declaration/MissionType.cs 20 additions, 0 deletionsVectoCore/Models/Declaration/MissionType.cs
- VectoCore/Models/Declaration/Segment.cs 18 additions, 0 deletionsVectoCore/Models/Declaration/Segment.cs
- VectoCore/Models/Declaration/VehicleCategory.cs 11 additions, 0 deletionsVectoCore/Models/Declaration/VehicleCategory.cs
- VectoCore/Models/DeclarationData.cs 0 additions, 24 deletionsVectoCore/Models/DeclarationData.cs
- VectoCore/Models/Simulation/IVectoRun.cs 19 additions, 0 deletionsVectoCore/Models/Simulation/IVectoRun.cs
Loading
Please register or sign in to comment