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 02, 2019
    • 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
  2. Nov 29, 2019
    • Markus Quaritsch's avatar
      Merge branch 'feature/whr-develop' into merge/VectoFurtherDeveropment · 682f20bf
      Markus Quaritsch authored
      # Conflicts:
      #	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DF.xsd
      #	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
      682f20bf
    • Markus Quaritsch's avatar
      Merge pull request #4 in ~EMQUARIMA/vecto-dev from... · 1adc2b43
      Markus Quaritsch authored
      Merge pull request #4 in ~EMQUARIMA/vecto-dev from feature/VECTO-1088-implementing-predictive-cruise-control to develop
      
      * commit '3b34c385': (52 commits)
        hide unsupported input field
        consider engine drag loss for AT also in PCC events and PCC segment pre-processing
        adding eco-roll for AT in neutral: don't add engine drag for estimating coasting force, at gearbos switch to neutral if according option is set
        fix: preprocessing for pcc segment annotation: remove condition that target speed must not change within the preview distance before x_v_low -> change start of pcc segment to min. of last target speed change and look-ahead distance
        fix: check for allowed adas combination with MT transmission
        extend allowed adas combination to other gearbox types, write at ecoroll lockupclutch to json file
        report progress: consider postprocessing step, sample xml for AT with eco-roll, invalid sample file, fix reading adas parameters from xml
        compute vehicleline correction in lation thread (sum-data and report afterwards are synchronized and thus a bottleneck)
        merging xml schema versions, reading adasxml version 2.3
        re-adding adas combination info to sum file
        adding new parameter for AT EcoRoll: release lockup clutch or disengage during eco roll...
        update state diagram on eco roll
        update state chart in documentation
        additional condition for activating pcc use-case 2: vehicle speed has to be below target speed - 1km/h
        bugfix: condition eco roll available in PCC preprocessor
        adding parameter max acceleration for eco roll to input parameters (enigineering mode), adding input field to gui, json file writer; renaming .vmod solumn ignitionOn -> iceOn; updating user manual
        refactoring moddatacontainer extension methods
        allow PCC segment preprocessing for AT gearboxes as well
        extend engineering schema for pcc and eco-roll data, add implementation and testcase to read pcc driver data
        adding missing file
        ...
      1adc2b43
    • Markus Quaritsch's avatar
      hide unsupported input field · 3b34c385
      Markus Quaritsch authored
      3b34c385
  3. Nov 28, 2019
  4. Nov 27, 2019
  5. Nov 26, 2019
  6. Nov 18, 2019
  7. Nov 14, 2019
  8. Nov 13, 2019
  9. Nov 08, 2019
  10. Oct 10, 2019
  11. Oct 02, 2019
  12. Sep 30, 2019
Loading