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

Skip to content
Snippets Groups Projects
This project is mirrored from https://*****:*****@code.europa.eu/vecto/vecto.git. Pull mirroring updated .
  1. Feb 02, 2022
  2. Feb 01, 2022
  3. Jan 28, 2022
  4. Jan 27, 2022
    • Markus Quaritsch's avatar
      Pull request #148: Bugfix/VECTO-1525 pcc preprocessing · 6d6f176d
      Markus Quaritsch authored
      Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1525-pcc-preprocessing to develop
      
      * commit '792138f1':
        pcc segment preprocessor: update targetspeed also in case of non-highway sections to avoid that pcc sections reach into parts without highway
        adding testcase for pcc segment preprocessing where a pcc segment starts shortly after standstill
      6d6f176d
    • Markus Quaritsch's avatar
      pcc segment preprocessor: update targetspeed also in case of non-highway... · 792138f1
      Markus Quaritsch authored
      pcc segment preprocessor: update targetspeed also in case of non-highway sections to avoid that pcc sections reach into parts without highway
      792138f1
    • Markus Quaritsch's avatar
    • Markus Quaritsch's avatar
      Merge branch 'feature/VECTO-1454-xml-schema-for-new-components' into merge/multistage_and_xml · 99595471
      Markus Quaritsch authored
      # Conflicts:
      #	Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_airdragonly.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_aux.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF_incl TC.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.VIF.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_VIF.xml
      #	Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml
      #	Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml
      #	Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml
      #	Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml
      #	Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml
      #	Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml
      #	Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL.xml
      #	Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF-DM_WHR.xml
      #	Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF.xml
      #	Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_WHR.xml
      #	Generic Vehicles/Declaration Mode/SingleBus_31b/primary_heavyBus group_P31_32_Smart_ES.xml
      #	Generic Vehicles/Declaration Mode/SingleBus_31b/vecto_vehicle-completed_heavyBus_31b.xml
      #	Generic Vehicles/Declaration Mode/SingleBus_34f/primary_heavyBus group_P33_34_SmartPS.xml
      #	Generic Vehicles/Declaration Mode/SingleBus_34f/vecto_vehicle-completed_heavyBus_34f.xml
      #	Generic Vehicles/Declaration Mode/VTP HeavyBus/CompletedBus_33c.MRF.xml
      #	VECTO.sln
      #	VECTO/GUI/ElectricMotorForm.Designer.vb
      #	VECTO/GUI/ElectricMotorForm.vb
      #	VECTO/Input Files/ElectricMachine.vb
      #	VECTO/Input Files/MockVehicleInputData.vb
      #	VECTO/Input Files/Vehicle.vb
      #	VECTO3GUI2020/Properties/Version.cs
      #	VectoCommon/VectoCommon/Hashing/VectoComponents.cs
      #	VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
      #	VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
      #	VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
      #	VectoCommon/VectoCommon/Resources/XMLNames.resx
      #	VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
      #	VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
      #	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
      #	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
      #	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
      #	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
      #	VectoCore/VectoCore/InputData/Impl/InputData.cs
      #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
      #	VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
      #	VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
      #	VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
      #	VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
      #	VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs
      #	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
      #	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
      #	VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
      #	VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd
      #	VectoCore/VectoCore/Utils/XMLDefinitions.cs
      #	VectoCore/VectoCore/VectoCore.csproj
      #	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
      #	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
      #	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
      #	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
      #	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
      #	VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
      #	VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
      #	VectoCore/VectoCoreTest/VectoCoreTest.csproj
      #	VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
      #	VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
      #	VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
      #	VectoCore/VectoXML.spp
      99595471
  5. Jan 25, 2022
  6. Jan 24, 2022
  7. Jan 21, 2022
  8. Jan 19, 2022
  9. Jan 18, 2022
  10. Jan 17, 2022
Loading