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. Jan 17, 2020
    • Markus Quaritsch's avatar
      make it compile · 774c1dbf
      Markus Quaritsch authored
      774c1dbf
    • Markus Quaritsch's avatar
      Merge branch... · 43cb5107
      Markus Quaritsch authored
      Merge branch 'feature/VECTO-1143-extending-segmentation-table-for-medium-lorries' into feature/VECTO-1190-declaration-mode-for-heavy-buses
      
      # Conflicts:
      #	VECTO/GUI/GearboxForm.vb
      #	VECTO/GUI/VectoJobForm.vb
      #	VECTO/OutputData/JSONFileWriter.vb
      #	VectoCommon/VectoCommon/Models/VehicleCategory.cs
      #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterTruck.cs
      #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
      #	VectoCore/VectoCore/Models/Declaration/TruckSegments.cs
      #	VectoCore/VectoCore/Models/Declaration/VehicleClass.cs
      #	VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs
      #	VectoCore/VectoCore/Resources/Declaration/CO2Standards/MissionProfileWeights.csv
      #	VectoCore/VectoCore/Resources/Declaration/CO2Standards/WeightingGroups.csv
      #	VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv
      #	VectoCore/VectoCore/VectoCore.csproj
      #	VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
      43cb5107
  2. Jan 16, 2020
  3. Jan 15, 2020
  4. Jan 14, 2020
    • Markus Quaritsch's avatar
      Merge branch 'merge/VectoFurtherDeveropment' into... · f53d982a
      Markus Quaritsch authored
      Merge branch 'merge/VectoFurtherDeveropment' into feature/VECTO-1190-declaration-mode-for-heavy-buses
      
      # Conflicts:
      #	.gitignore
      #	VECTO/GUI/VectoJobForm.vb
      #	VECTO/Input Files/Engine.vb
      #	VECTO/OutputData/JSONFileWriter.vb
      #	VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
      #	VectoCommon/VectoCommon/Resources/XMLNames.resx
      #	VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
      #	VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
      #	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
      #	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringDriverDataProvider.cs
      #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterTruck.cs
      #	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
      #	VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
      #	VectoCore/VectoCore/Models/Declaration/LookupData.cs
      #	VectoCore/VectoCore/Models/Declaration/TruckSegments.cs
      #	VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
      #	VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
      #	VectoCore/VectoCore/OutputData/IModalDataContainer.cs
      #	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
      #	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
      #	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd
      #	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
      #	VectoCore/VectoCore/Utils/XMLDefinitions.cs
      #	VectoCore/VectoCore/VectoCore.csproj
      #	VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
      #	VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
      #	VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs
      #	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel.xml
      #	VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
      #	VectoCore/VectoCoreTest/VectoCoreTest.csproj
      #	VectoCore/VectoXML.spp
      f53d982a
    • Markus Quaritsch's avatar
      1a2fc927
    • Markus Quaritsch's avatar
      adding missing file · 671c1462
      Markus Quaritsch authored
      671c1462
    • Markus Quaritsch's avatar
    • Markus Quaritsch's avatar
      230db796
  5. Jan 13, 2020
  6. Jan 09, 2020
  7. Jan 08, 2020
  8. Jan 07, 2020
  9. Dec 20, 2019
  10. Dec 19, 2019
  11. Dec 17, 2019
  12. Dec 13, 2019
Loading