Merge branch 'feature/VECTO-592-eptp-simulation-mode' into Private/SI-Unit
# Conflicts: # VECTO.sln # VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs # VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs
No related branches found
No related tags found
Showing
- Documentation/VectoHashingTool/convert.bat 1 addition, 1 deletionDocumentation/VectoHashingTool/convert.bat
- VECTO.sln 6 additions, 3 deletionsVECTO.sln
- VECTO.sln.DotSettings 1 addition, 0 deletionsVECTO.sln.DotSettings
- VECTO/GUI/MainForm.Designer.vb 1 addition, 1 deletionVECTO/GUI/MainForm.Designer.vb
- VECTO/GUI/MainForm.vb 10 additions, 10 deletionsVECTO/GUI/MainForm.vb
- VECTO/GUI/VectoVTPJobForm.Designer.vb 145 additions, 111 deletionsVECTO/GUI/VectoVTPJobForm.Designer.vb
- VECTO/GUI/VectoVTPJobForm.resx 0 additions, 258 deletionsVECTO/GUI/VectoVTPJobForm.resx
- VECTO/GUI/VectoVTPJobForm.vb 9 additions, 5 deletionsVECTO/GUI/VectoVTPJobForm.vb
- VECTO/Input Files/VectoEPTPJob.vb 20 additions, 10 deletionsVECTO/Input Files/VectoEPTPJob.vb
- VECTO/OutputData/JSONFileWriter.vb 3 additions, 2 deletionsVECTO/OutputData/JSONFileWriter.vb
- VECTO/Resources/P_fan_eqn.png 0 additions, 0 deletionsVECTO/Resources/P_fan_eqn.png
- VECTO/VECTO.vbproj 5 additions, 7 deletionsVECTO/VECTO.vbproj
- VectoCommon/VectoCommon/InputData/EngineeringInputData.cs 1 addition, 1 deletionVectoCommon/VectoCommon/InputData/EngineeringInputData.cs
- VectoCommon/VectoCommon/InputData/IInputDataProvider.cs 6 additions, 4 deletionsVectoCommon/VectoCommon/InputData/IInputDataProvider.cs
- VectoCommon/VectoCommon/OutputData/IOutputFileWriter.cs 1 addition, 1 deletionVectoCommon/VectoCommon/OutputData/IOutputFileWriter.cs
- VectoCommon/VectoHashing/IVectoHash.cs 1 addition, 1 deletionVectoCommon/VectoHashing/IVectoHash.cs
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs 624 additions, 621 deletionsVectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs 1 addition, 1 deletion...e/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
- VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs 42 additions, 22 deletions...Core/VectoCore/InputData/Reader/DrivingCycleDataReader.cs
- VectoCore/VectoCore/InputData/Reader/Impl/EngineeringVTPModeVectoRunDataFactory.cs 27 additions, 7 deletions...Data/Reader/Impl/EngineeringVTPModeVectoRunDataFactory.cs
Loading
Please register or sign in to comment