Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Forked from VECTO / VECTO Sim
4776 commits behind the upstream repository.
user avatar
Markus QUARITSCH authored
# Conflicts:
#	.gitignore
#	Documentation/User Manual Source/Release Notes Vecto3.x.pdf
#	Documentation/User Manual Source/Release Notes Vecto3.x.pptx
#	Documentation/User Manual/5-input-and-output-files/VDRI.md
#	Documentation/User Manual/5-input-and-output-files/VMOD.md
#	Documentation/User Manual/5-input-and-output-files/VSUM.md
#	Documentation/User Manual/help.html
#	HashingTool/Properties/Version.cs
#	Tools/GraphDrawer/Program.cs
#	VECTO.sln.DotSettings
#	VECTO/GUI/MainForm.Designer.vb
#	VECTO/GUI/VectoJobForm.Designer.vb
#	VECTO/GUI/VectoJobForm.resx
#	VECTO/GUI/VectoJobForm.vb
#	VECTO/GUI/VehicleForm.Designer.vb
#	VECTO/GUI/VehicleForm.vb
#	VECTO/Input Files/Vehicle.vb
#	VECTO/OutputData/JSONFileWriter.vb
#	VECTO/VECTO.vbproj
#	VECTOAux/VectoAuxiliaries/Hvac/HVACSteadyStateModel.vb
#	VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb
#	VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
#	VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
#	VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
#	VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
#	VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
#	VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
#	VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
#	VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
#	VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
#	VectoCommon/VectoCommon/InputData/DigestData.cs
#	VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
#	VectoCommon/VectoCommon/Models/VehicleCategory.cs
#	VectoCommon/VectoCommon/Properties/Version.cs
#	VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
#	VectoCommon/VectoHashing/Properties/Version.cs
#	VectoCommon/VectoHashingTest/VectoHashingTest.csproj
#	VectoConsole/Properties/Version.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Common/AbstractXMLType.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/AbstractCommonComponentType.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAngledriveDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAuxiliariesDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationEngineDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/IXMLDeclarationInputDataReader.cs

+ merge conflicts and make things compile...
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Interfaces/IXMLDeclarationInputData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Interfaces/IXMLDeclarationVehicleData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLJobDataReader.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractCommonComponentType.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractEngineeringXMLComponentDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractXMLType.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAuxiliariesDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearshiftData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringJobInputDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringOverspeed.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/XMLInputDataNinjectModule.cs
#	VectoCore/VectoCore/InputData/Reader/ComponentData/DrivingCycleDataReader.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/JsonKeys.Designer.cs
#	VectoCore/VectoCore/JsonKeys.resx
#	VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
#	VectoCore/VectoCore/Models/Simulation/Impl/DistanceRun.cs
#	VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
#	VectoCore/VectoCore/Models/Simulation/SimulationFactoryNinjectModule.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Data/DriverData.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/IdleControllerSwitcher.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/PTOCycleController.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
#	VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringEngineWriter.cs
#	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
#	VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
#	VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs
#	VectoCore/VectoCore/Properties/Version.cs
#	VectoCore/VectoCore/Resources/Declaration/CO2Standards/MissionProfileWeights.csv
#	VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv
#	VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCore/VersionNumber.t4
#	VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AAuxTests.cs
#	VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
#	VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
#	VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
#	VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs
#	VectoCore/VectoCoreTest/Integration/ShiftStrategy/ShiftStrategyTest.cs
#	VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
#	VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
#	VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
#	VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs
#	VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
#	VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs
#	VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs
#	VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
#	VectoCore/VectoCoreTest/Models/Simulation/MockSumWriter.cs
#	VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
#	VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
#	VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs
#	VectoCore/VectoCoreTest/Models/SimulationComponentData/FuelConsumptionMapTest.cs
#	VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/vtp_cycle_citybus_atser.vdri
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_1.0.xml
#	VectoCore/VectoCoreTest/Utils/GraphWriter.cs
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj
#	VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
14960a36
History
Code owners
Assign users and groups as approvers for specific file changes. Learn more.
Name Last commit Last update
..
Developer Guide
GUI Source
ReleaseNotes
SimulationModel
User Manual Source
User Manual
VectoCoreArchitecture
VectoHashingTool
VehiclesReleaseComparisonDeclarationMode
XML
Cdv_Generator_VECTO3.2.xlsx
Checklist_Release_VECTO.dotx
Checklist_Release_VECTO_3.1.0.652.docx
Checklist_Release_VECTO_3.1.0.662.docx
Checklist_Release_VECTO_3.1.0.683.docx
Checklist_Release_VECTO_3.1.1.742.docx
Checklist_Release_VECTO_3.1.1.748.docx
Checklist_Release_VECTO_3.1.2.796.docx
Checklist_Release_VECTO_3.1.2.810.docx
Checklist_Release_VECTO_3.2.0.1005.docx
Checklist_Release_VECTO_3.2.0.1022.docx
Checklist_Release_VECTO_3.2.0.925.docx
Checklist_Release_VECTO_3.2.0.940.docx
Checklist_Release_VECTO_3.2.1.1054.docx
Checklist_Release_VECTO_3.2.1.1054.pdf
Checklist_Release_VECTO_3.2.1.1079.docx
Checklist_Release_VECTO_3.2.1.1079.pdf
Checklist_Release_VECTO_3.2.1.1133.docx
Checklist_Release_VECTO_3.2.1.1133.pdf
Checklist_Release_VECTO_3.3.0.1250.docx
Checklist_Release_VECTO_3.3.0.1250.pdf
Checklist_Release_VECTO_3.3.0.1398.docx
Checklist_Release_VECTO_3.3.0.1398.pdf
Checklist_Release_VECTO_3.3.0.1433.docx
Checklist_Release_VECTO_3.3.1.1463.docx
Checklist_Release_VECTO_3.3.1.1463.pdf
Checklist_Release_VECTO_3.3.1.1492.docx
Checklist_Release_VECTO_3.3.1.1492.pdf
Checklist_Release_VECTO_3.3.2.1519.docx
Checklist_Release_VECTO_3.3.2.1519.pdf
Checklist_Release_VECTO_3.3.2.1548.docx
Checklist_Release_VECTO_3.3.2.1548.pdf
Checklist_Release_VECTO_3.3.3.1609.docx
Checklist_Release_VECTO_3.3.3.1609.pdf
Checklist_Release_VECTO_3.3.3.1639.docx
Checklist_Release_VECTO_3.3.3.1639.pdf
Checklist_Release_VECTO_3.3.4.1686.docx
Checklist_Release_VECTO_3.3.4.1686.pdf
Checklist_Release_VECTO_3.3.4.1716.docx
Checklist_Release_VECTO_3.3.4.1716.pdf
Checklist_Release_VECTO_3.3.5.1783.docx
Checklist_Release_VECTO_3.3.5.1783.pdf
Checklist_Release_VECTO_3.3.5.1812.docx
Checklist_Release_VECTO_3.3.5.1812.pdf
Checklist_Release_VECTO_3.3.6.1898.docx
Checklist_Release_VECTO_3.3.6.1898.pdf
Checklist_Release_VECTO_3.3.6.1916.docx
Checklist_Release_VECTO_3.3.6.1916.pdf
Checklist_Release_VECTO_3.3.7.1964.docx
Checklist_Release_VECTO_3.3.7.1964.pdf
Checklist_Release_VECTO_3.3.8.2024.docx
Checklist_Release_VECTO_3.3.8.2024.pdf
Checklist_Release_VECTO_3.3.8.2052.docx
Checklist_Release_VECTO_3.3.8.2052.pdf
Checklist_Release_VECTO_3.3.9.2147-RC.docx
Checklist_Release_VECTO_3.3.9.2147-RC.pdf
Checklist_Release_VECTO_3.3.9.2175.docx
Checklist_Release_VECTO_3.3.9.2175.pdf
Checks_PTO_Class9_RigidTruck_6x2_PTO.xlsx
Comparison Vecto Results.xlsx
ExceptionsDescription.xlsx
Torque Converter Simulation.docx
VECTO Input Parameters.xlsx
VECTO-3.3.0.1398_FC-comparison.PNG
VECTO_3.1.1.742.vsum
VECTO_3.1.1.748.vsum
VECTO_3.1.2.796.vsum
VECTO_3.1.2.810.vsum
VECTO_3.2.0.1005.vsum
VECTO_3.2.0.1005_FC-comparison_corr.PNG
VECTO_3.2.0.925.vsum
VECTO_3.2.0.940.vsum
VectoResults_3.1.2.796.xlsx
VectoResults_3.1.2.810.xlsx
VectoResults_3.2.0.1005.xlsx
VectoResults_3.2.0.1022.xlsx
VectoResults_3.2.0.925.xlsx
VectoResults_3.2.0.940.xlsx
VectoResults_3.2.1.1079.xlsx
VectoResults_3.2.1.1133.xlsx
VectoResults_3.3.0.1250.xlsx
VectoResults_3.3.0.1398.xlsx
VectoResults_3.3.0.1433.xlsx
VectoResults_3.3.1.1463.xlsx
VectoResults_3.3.1.1492.xlsx
VectoResults_3.3.2.1519.xlsx
VectoResults_3.3.2.1548.xlsx
VectoResults_3.3.3.1609-RC.xlsx
VectoResults_3.3.3.1639.xlsx
VectoResults_3.3.4.1686.xlsx