Merge branch 'develop' into merge/Vecto_3.3.10
# Conflicts: # VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedTruck.cs # VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
No related branches found
No related tags found
Showing
- VECTO/GUI/BusAuxiliariesEngParametersForm.Designer.vb 13 additions, 13 deletionsVECTO/GUI/BusAuxiliariesEngParametersForm.Designer.vb
- VECTO/GUI/BusAuxiliariesEngParametersForm.vb 48 additions, 21 deletionsVECTO/GUI/BusAuxiliariesEngParametersForm.vb
- VECTO/GUI/VectoJobForm.vb 14 additions, 13 deletionsVECTO/GUI/VectoJobForm.vb
- VECTO/Input Files/BusParamsEngineering.vb 6 additions, 0 deletionsVECTO/Input Files/BusParamsEngineering.vb
- VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs 81 additions, 1 deletion...utData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
- VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs 5 additions, 4 deletions...putData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
- VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/CompressorMap.cs 9 additions, 6 deletions...iaries/DownstreamModules/Impl/Pneumatics/CompressorMap.cs
- VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs 94 additions, 11 deletions...ore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
- VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs 1 addition, 1 deletion...Core/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
- VectoCore/VectoCore/Models/SimulationComponent/IElectricMotor.cs 3 additions, 0 deletions...re/VectoCore/Models/SimulationComponent/IElectricMotor.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs 16 additions, 0 deletions...ectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
- VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs 9 additions, 1 deletionVectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
- VectoCore/VectoCore/OutputData/SummaryDataContainer.cs 6 additions, 3 deletionsVectoCore/VectoCore/OutputData/SummaryDataContainer.cs
- VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedTruck.cs 2 additions, 0 deletions.../ManufacturerReport/XMLManufacturerReportExemptedTruck.cs
- VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs 12 additions, 0 deletions...reTest/Integration/BatteryElectric/BatteryElectricTest.cs
- VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_BusAux.vecto 45 additions, 0 deletions...ata/BatteryElectric/GenericVehicleB2/BEV_ENG_BusAux.vecto
- VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/PEV-BusAux.vaux 34 additions, 0 deletions...TestData/BatteryElectric/GenericVehicleB2/PEV-BusAux.vaux
- VectoCore/VectoCoreTest/VectoCoreTest.csproj 6 additions, 0 deletionsVectoCore/VectoCoreTest/VectoCoreTest.csproj
- VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml 0 additions, 577 deletions...actorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
Loading
Please register or sign in to comment