Merge branch 'develop' of...
Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-dev into feature/VECTO-1073-support-for-dual-fuel-engines # Conflicts: # HashingTool/Properties/Version.cs # VectoCommon/VectoCommon/Properties/Version.cs # VectoCommon/VectoHashing/Properties/Version.cs # VectoConsole/Properties/Version.cs # VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs # VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs # VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs # VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs # VectoCore/VectoCore/Models/Simulation/Data/ModalResultField.cs # VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs # VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs # VectoCore/VectoCore/OutputData/IModalDataContainer.cs # VectoCore/VectoCore/OutputData/ModalDataContainer.cs # VectoCore/VectoCore/OutputData/SummaryDataContainer.cs # VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs # VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs # VectoCore/VectoCore/Properties/Version.cs # VectoCore/VectoCore/Utils/VectoVersionCore.cs # VectoCore/VectoCore/VersionNumber.t4 # VectoCore/VectoCoreTest/Integration/Declaration/ADASVehicleTest.cs # VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs # VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs # VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
No related branches found
No related tags found
Showing
- Documentation/User Manual/3-simulation-models/ADAS_EcoRoll.md 43 additions, 2 deletions...mentation/User Manual/3-simulation-models/ADAS_EcoRoll.md
- Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md 9 additions, 0 deletions...n/User Manual/3-simulation-models/Engine_FC_Correction.md
- Documentation/User Manual/3-simulation-models/Engine_StartStop.md 0 additions, 4 deletions...ation/User Manual/3-simulation-models/Engine_StartStop.md
- Documentation/User Manual/3-simulation-models/Vehicle_ADAS_technologies.md 0 additions, 136 deletions...r Manual/3-simulation-models/Vehicle_ADAS_technologies.md
- Documentation/User Manual/5-input-and-output-files/VMOD.md 4 additions, 2 deletionsDocumentation/User Manual/5-input-and-output-files/VMOD.md
- Documentation/User Manual/5-input-and-output-files/VSUM.md 8 additions, 3 deletionsDocumentation/User Manual/5-input-and-output-files/VSUM.md
- Documentation/User Manual/files.txt 1 addition, 1 deletionDocumentation/User Manual/files.txt
- Documentation/User Manual/help.html 113 additions, 851 deletionsDocumentation/User Manual/help.html
- Documentation/User Manual/pics/FC_Correction.PNG 0 additions, 0 deletionsDocumentation/User Manual/pics/FC_Correction.PNG
- Tools/GraphDrawer/bin/Debug/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.RSLT_MANUFACTURER.xml 323 additions, 0 deletions...PMode/GenericVehicle/CityBus_AT_Ser.RSLT_MANUFACTURER.xml
- VECTO.sln 0 additions, 24 deletionsVECTO.sln
- VECTO/GUI/AboutBox.vb 2 additions, 2 deletionsVECTO/GUI/AboutBox.vb
- VECTO/GUI/MainForm.vb 3 additions, 3 deletionsVECTO/GUI/MainForm.vb
- VECTO/GUI/VectoJobForm.Designer.vb 1295 additions, 1190 deletionsVECTO/GUI/VectoJobForm.Designer.vb
- VECTO/GUI/VectoJobForm.vb 9 additions, 0 deletionsVECTO/GUI/VectoJobForm.vb
- VECTO/GUI/WelcomeDialog.vb 2 additions, 1 deletionVECTO/GUI/WelcomeDialog.vb
- VECTO/Input Files/Engine.vb 6 additions, 0 deletionsVECTO/Input Files/Engine.vb
- VECTO/Input Files/VectoJob.vb 21 additions, 0 deletionsVECTO/Input Files/VectoJob.vb
- VECTO/OutputData/JSONFileWriter.vb 7 additions, 4 deletionsVECTO/OutputData/JSONFileWriter.vb
- VectoCommon/VectoCommon/InputData/EngineeringInputData.cs 5 additions, 0 deletionsVectoCommon/VectoCommon/InputData/EngineeringInputData.cs
Loading
Please register or sign in to comment