-
- Downloads
Merge branch 'develop' of...
Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into bugfix/VECTO-156-refactoring-of-input-data-handling # By Michael Krisper (6) and Markus Quaritsch (5) # Via QUARITSCH Markus (5) and others * 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim: add checks for reading driving cycle, additional testcases for drivingcycledata bugfix: summary file / modalDataWriter: fixing null-reference for stopTime if cycle contains no stops added eupl license header to python script for converting declaration data into new format added EUPL license header to all source files added project for adding licence headers to all cs files corrected progress percent jump new dev build 334 testcase for speed-dependent cross-wind correction implementing speed-dependent crosswind correction, refactoring of crosswind correction curve added exceptions when file not exists [VECTO-134] show file links in status output in GUI Conflicts: DeclarationCycleZip/Program.cs VECTO/GUI/F_MAINForm.vb VectoCore/FileIO/DeclarationFile/EngineFileDecl.cs VectoCore/FileIO/DeclarationFile/GearboxFileDecl.cs VectoCore/FileIO/DeclarationFile/JobFileDecl.cs VectoCore/FileIO/DeclarationFile/VehicleFileDecl.cs VectoCore/FileIO/EngineeringFile/EngineFileEng.cs VectoCore/FileIO/EngineeringFile/GearboxFileEng.cs VectoCore/FileIO/EngineeringFile/JobFileEng.cs VectoCore/FileIO/EngineeringFile/VehicleFileEng.cs VectoCore/FileIO/InputFileReader.cs VectoCore/FileIO/JsonDataHeader.cs VectoCore/FileIO/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs VectoCore/FileIO/Reader/DataObjectAdaper/EngineeringDataAdapter.cs VectoCore/FileIO/Reader/ISimulationDataReader.cs VectoCore/FileIO/Reader/Impl/AbstractSimulationDataReader.cs VectoCore/FileIO/Reader/Impl/DeclarationModeSimulationDataReader.cs VectoCore/FileIO/Reader/Impl/EngineOnlySimulationDataReader.cs VectoCore/FileIO/Reader/Impl/EngineeringModeSimulationDataReader.cs VectoCore/FileIO/VectoFiles.cs VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs VectoCore/Models/Simulation/Impl/JobContainer.cs VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs VectoCore/Models/SimulationComponent/Data/RetarderLossMap.cs VectoCore/Models/SimulationComponent/Data/VehicleData.cs VectoCore/Models/SimulationComponent/Impl/Vehicle.cs VectoCore/OutputData/IModalDataContainer.cs VectoCore/OutputData/ModalDataContainer.cs VectoCore/OutputData/PDF/DeclarationReport.cs VectoCore/OutputData/SummaryDataContainer.cs VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs VectoCoreTest/Integration/Truck40tPowerTrain.cs VectoCoreTest/Models/Simulation/VechicleContainerTests.cs VectoCoreTest/Models/SimulationComponent/DriverTest.cs VectoCoreTest/Models/SimulationComponent/VehicleTest.cs VectoCoreTest/Models/SimulationComponentData/DistanceCycleDataTest.cs
Showing
- DeclarationConverter/DeclarationConverter.py 15 additions, 0 deletionsDeclarationConverter/DeclarationConverter.py
- DeclarationCycleZip/Program.cs 17 additions, 1 deletionDeclarationCycleZip/Program.cs
- DeclarationCycleZip/Properties/AssemblyInfo.cs 17 additions, 1 deletionDeclarationCycleZip/Properties/AssemblyInfo.cs
- GraphDrawer/Program.cs 17 additions, 1 deletionGraphDrawer/Program.cs
- GraphDrawer/Properties/AssemblyInfo.cs 17 additions, 1 deletionGraphDrawer/Properties/AssemblyInfo.cs
- LicenceHeader/App.config 6 additions, 0 deletionsLicenceHeader/App.config
- LicenceHeader/LicenceHeader.csproj 63 additions, 0 deletionsLicenceHeader/LicenceHeader.csproj
- LicenceHeader/Program.cs 54 additions, 0 deletionsLicenceHeader/Program.cs
- LicenceHeader/Properties/AssemblyInfo.cs 52 additions, 0 deletionsLicenceHeader/Properties/AssemblyInfo.cs
- LicenceHeader/header.txt 16 additions, 0 deletionsLicenceHeader/header.txt
- VECTO.sln 10 additions, 0 deletionsVECTO.sln
- VECTO/GUI/F_MAINForm.Designer.vb 55 additions, 52 deletionsVECTO/GUI/F_MAINForm.Designer.vb
- VECTO/GUI/F_MAINForm.vb 2503 additions, 2396 deletionsVECTO/GUI/F_MAINForm.vb
- VectoConsole/Program.cs 17 additions, 1 deletionVectoConsole/Program.cs
- VectoConsole/Properties/AssemblyInfo.cs 17 additions, 1 deletionVectoConsole/Properties/AssemblyInfo.cs
- VectoConsole/Properties/Version.cs 18 additions, 4 deletionsVectoConsole/Properties/Version.cs
- VectoConsole/Properties/Version.tt 16 additions, 1 deletionVectoConsole/Properties/Version.tt
- VectoCore/Configuration/Constants.cs 17 additions, 1 deletionVectoCore/Configuration/Constants.cs
- VectoCore/Exceptions/VectoExceptions.cs 17 additions, 1 deletionVectoCore/Exceptions/VectoExceptions.cs
- VectoCore/Exceptions/VectoSimulationException.cs 17 additions, 1 deletionVectoCore/Exceptions/VectoSimulationException.cs
Loading
Please register or sign in to comment