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. Dec 06, 2019
  2. Dec 05, 2019
  3. Dec 04, 2019
  4. Dec 03, 2019
  5. Dec 02, 2019
    • Markus Quaritsch's avatar
      cleaning up imports, fix lineendings · d0c3cda4
      Markus Quaritsch authored
      d0c3cda4
    • Markus Quaritsch's avatar
      make it compile · a8e7923a
      Markus Quaritsch authored
      a8e7923a
    • Markus Quaritsch's avatar
      Merge branch 'feature/VECTO-1082-include-waste-heat-recovery-systems' into... · cc53c518
      Markus Quaritsch authored
      Merge branch 'feature/VECTO-1082-include-waste-heat-recovery-systems' into merge/VectoFurtherDeveropment
      
      # Conflicts:
      #	HashingTool/Properties/Version.cs
      #	VECTO/GUI/VectoJobForm.vb
      #	VECTO/OutputData/JSONFileWriter.vb
      #	VectoCommon/VectoCommon/Properties/Version.cs
      #	VectoCommon/VectoCommon/Resources/XMLNames.resx
      #	VectoCommon/VectoHashing/Properties/Version.cs
      #	VectoConsole/Properties/Version.cs
      #	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
      #	VectoCore/VectoCore/Properties/Version.cs
      #	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DF.xsd
      #	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
      #	VectoCore/VectoCore/Utils/VectoVersionCore.cs
      #	VectoCore/VectoCore/Utils/XMLDefinitions.cs
      #	VectoCore/VectoCore/VectoCore.csproj
      #	VectoCore/VectoCore/VersionNumber.t4
      cc53c518
    • Markus Quaritsch's avatar
    • Markus Quaritsch's avatar
      c4b3aa9c
    • Markus Quaritsch's avatar
      fix running engine-only simulation · 9b777dfd
      Markus Quaritsch authored
      9b777dfd
    • Markus Quaritsch's avatar
      make vecto compile and run · 92e752b3
      Markus Quaritsch authored
      92e752b3
    • Markus Quaritsch's avatar
      Merge branch 'dev/AMT_ShiftStrategy' into merge/VectoFurtherDeveropment · c7f57d2e
      Markus Quaritsch authored
      # Conflicts:
      #	HashingTool/Properties/Version.cs
      #	VECTO/Configuration.vb
      #	VECTO/GUI/GearboxForm.vb
      #	VECTO/GUI/MainForm.Designer.vb
      #	VECTO/GUI/MainForm.vb
      #	VECTO/GUI/VectoJobForm.Designer.vb
      #	VECTO/GUI/VectoJobForm.vb
      #	VECTO/Input Files/Gearbox.vb
      #	VECTO/Input Files/VectoJob.vb
      #	VECTO/OutputData/JSONFileWriter.vb
      #	VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
      #	VECTOAux/VectoAuxiliariesTests/packages.config
      #	VectoCommon/VectoCommon/Properties/Version.cs
      #	VectoCommon/VectoHashing/Properties/Version.cs
      #	VectoCommon/VectoHashingTest/VectoHashingTest.csproj
      #	VectoConsole/Properties/Version.cs
      #	VectoCore/VectoCore/InputData/Reader/ComponentData/DrivingCycleDataReader.cs
      #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
      #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
      #	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
      #	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
      #	VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
      #	VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
      #	VectoCore/VectoCore/Models/Simulation/ISimulationPreprocessor.cs
      #	VectoCore/VectoCore/Models/Simulation/IVehicleContainer.cs
      #	VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
      #	VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs
      #	VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
      #	VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
      #	VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
      #	VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
      #	VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
      #	VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
      #	VectoCore/VectoCore/OutputData/IModalDataContainer.cs
      #	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
      #	VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
      #	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
      #	VectoCore/VectoCore/Properties/Version.cs
      #	VectoCore/VectoCore/Utils/VectoVersionCore.cs
      #	VectoCore/VectoCore/VectoCore.csproj
      #	VectoCore/VectoCore/VersionNumber.t4
      #	VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
      #	VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
      #	VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
      #	VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxShiftLossesTest.cs
      #	VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
      #	VectoCore/VectoCoreTest/VectoCoreTest.csproj
      c7f57d2e
Loading