Merge remote-tracking branch 'vecto/develop' into feature/VECTO-173-lossmap-sanity-check
Conflicts: VECTO/GUI/F_MAINForm.vb VectoConsole/Program.cs VectoCore/FileIO/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs VectoCore/FileIO/Reader/DataObjectAdaper/EngineeringDataAdapter.cs VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs VectoCore/Models/Simulation/Impl/SimulatorFactory.cs VectoCore/Models/Simulation/Impl/VehicleContainer.cs VectoCore/OutputData/ModalDataContainer.cs VectoCoreTest/Integration/DeclarationReportTest.cs VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs VectoCoreTest/Integration/FullCycleDeclarationTest.cs VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs VectoCoreTest/Models/Simulation/AuxTests.cs VectoCoreTest/Models/Simulation/SimulationTests.cs VectoCoreTest/Models/SimulationComponent/DriverTest.cs VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs VectoCoreTest/Utils/GraphWriter.cs
No related branches found
No related tags found
Showing
- DeclarationCycleZip/Program.cs 1 addition, 5 deletionsDeclarationCycleZip/Program.cs
- VECTO/GUI/F_MAINForm.vb 2511 additions, 2476 deletionsVECTO/GUI/F_MAINForm.vb
- VectoConsole/Program.cs 188 additions, 180 deletionsVectoConsole/Program.cs
- VectoCore/Configuration/Constants.cs 2 additions, 0 deletionsVectoCore/Configuration/Constants.cs
- VectoCore/Exceptions/VectoExceptions.cs 1 addition, 0 deletionsVectoCore/Exceptions/VectoExceptions.cs
- VectoCore/FileIO/DeclarationFile/EngineFileDecl.cs 0 additions, 113 deletionsVectoCore/FileIO/DeclarationFile/EngineFileDecl.cs
- VectoCore/FileIO/DeclarationFile/GearboxFileDecl.cs 0 additions, 75 deletionsVectoCore/FileIO/DeclarationFile/GearboxFileDecl.cs
- VectoCore/FileIO/DeclarationFile/JobFileDecl.cs 0 additions, 153 deletionsVectoCore/FileIO/DeclarationFile/JobFileDecl.cs
- VectoCore/FileIO/DeclarationFile/VehicleFileDecl.cs 0 additions, 89 deletionsVectoCore/FileIO/DeclarationFile/VehicleFileDecl.cs
- VectoCore/FileIO/EngineeringFile/EngineFileEng.cs 0 additions, 36 deletionsVectoCore/FileIO/EngineeringFile/EngineFileEng.cs
- VectoCore/FileIO/EngineeringFile/GearboxFileEng.cs 0 additions, 165 deletionsVectoCore/FileIO/EngineeringFile/GearboxFileEng.cs
- VectoCore/FileIO/EngineeringFile/JobFileEng.cs 0 additions, 127 deletionsVectoCore/FileIO/EngineeringFile/JobFileEng.cs
- VectoCore/FileIO/EngineeringFile/VehicleFileEng.cs 0 additions, 61 deletionsVectoCore/FileIO/EngineeringFile/VehicleFileEng.cs
- VectoCore/FileIO/InputFileReader.cs 0 additions, 39 deletionsVectoCore/FileIO/InputFileReader.cs
- VectoCore/FileIO/JsonDataHeader.cs 0 additions, 73 deletionsVectoCore/FileIO/JsonDataHeader.cs
- VectoCore/FileIO/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs 0 additions, 95 deletions.../Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
- VectoCore/FileIO/Reader/DataObjectAdaper/EngineeringDataAdapter.cs 0 additions, 242 deletions.../FileIO/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
- VectoCore/FileIO/Reader/ISimulationDataReader.cs 0 additions, 47 deletionsVectoCore/FileIO/Reader/ISimulationDataReader.cs
- VectoCore/FileIO/Reader/Impl/AbstractSimulationDataReader.cs 0 additions, 67 deletionsVectoCore/FileIO/Reader/Impl/AbstractSimulationDataReader.cs
- VectoCore/FileIO/Reader/Impl/DeclarationModeSimulationDataReader.cs 0 additions, 265 deletions...FileIO/Reader/Impl/DeclarationModeSimulationDataReader.cs
Loading
Please register or sign in to comment