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

Skip to content
Snippets Groups Projects
  1. Oct 10, 2019
  2. Oct 03, 2019
  3. Oct 02, 2019
  4. Oct 01, 2019
  5. Sep 24, 2019
  6. Sep 23, 2019
  7. Sep 20, 2019
  8. Sep 19, 2019
  9. Aug 12, 2019
    • Markus QUARITSCH's avatar
      Merge branch 'develop' of... · de654829
      Markus QUARITSCH authored
      Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-dev into develop
      de654829
    • Markus QUARITSCH's avatar
      Merge branch 'develop' of... · c62ae092
      Markus QUARITSCH authored
      Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into develop
      c62ae092
    • Markus QUARITSCH's avatar
      Merge pull request #8 in VECTO/vecto-dev from... · a4847fb8
      Markus QUARITSCH authored
      Merge pull request #8 in VECTO/vecto-dev from ~EMQUARIMA/vecto-dev-ff:feature/VECTO-1082-include-waste-heat-recovery-systems to develop
      
      * commit 'd26024d6': (28 commits)
        fix: set ignition state in torque converter if locked
        renaming property engine stop/start activation delay, separate reader and class for ESS driver data
        re-compiled user manual, adding whr do fc-map
        updating engine file to new file format
        correcting wrong naming in engine form
        adding missing units to aux columns in mod data
        updating user manual (WHR, ESS), some clarifications on ESS and WHR in .vmod and .vsum
        removing testcase no longer relevant, re-activating ng-ci fuel in testcase
        updating engineering job xml testdata
        adding note regarding whr to gui
        make engineering xml with dual fuel and whr work, some refactoring
        adding testcase for whr with engineering xml
        adding dual fuel and whr to xml in engineering mode, adapting schema and adding sample files
        updating writing engineering xml
        updating test files
        updating testdata (vmod and vsum) - new columns for whr
        updatgin engineering schema, updating manufacturer report (added whr type)
        adding dual fuel for json job files in engineering mode
        adding testcase for dual fuel in engineering mode
        adding whr to gui (.vecto jobs in declaration and engineering mode)
        ...
      a4847fb8
    • Markus QUARITSCH's avatar
    • Markus QUARITSCH's avatar
      Merge branch 'develop' of... · fbe48f9c
      Markus QUARITSCH authored
      Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-dev into feature/VECTO-1082-include-waste-heat-recovery-systems
      
      # Conflicts:
      #	VECTO/GUI/VectoJobForm.vb
      #	VECTO/Input Files/VectoJob.vb
      #	VECTO/OutputData/JSONFileWriter.vb
      #	VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
      #	VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
      #	VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
      #	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringDriverDataProvider.cs
      #	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Factory/IEngineeringReaderInjectFactory.cs
      #	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/NinjectModules/XMLEngineeringReaderV10InjectModule.cs
      #	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/IXMLDriverDataReader.cs
      #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
      #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
      #	VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
      #	VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.1.0.xsd
      #	VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
      #	VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs
      fbe48f9c
    • Markus QUARITSCH's avatar
      Merge pull request #787 in VECTO/vecto-sim from... · cb385c86
      Markus QUARITSCH authored
      Merge pull request #787 in VECTO/vecto-sim from ~EMBRANDST/vecto-sim:feature/VECTO-1064-add-weighting-factors-for-vehicle-groups-1-2-3-11-12-16 to develop
      
      * commit '18d6db0f':
        Fixed testcases by using independent formatting of decimal numbers
      cb385c86
    • Markus QUARITSCH's avatar
      Merge pull request #7 in VECTO/vecto-dev from... · b06bf224
      Markus QUARITSCH authored
      Merge pull request #7 in VECTO/vecto-dev from ~EMQUARIMA/vecto-dev:feature/VECTO-975-implementing-eco-roll-with-and-without-engine-stop to develop
      
      * commit '8be10cbd':
        adding testcase for eco-roll with AT
        adding ttestdata for at eco-roll, updating testcases for AT ecor-roll
        updating repo
        don''t allow eco-roll for MT gearboxes, ignore ecoroll with engine-off for AT gearboxes
        add status about eco-roll conditions to state class, write eco-roll condition to mod-file
        change criterion for eco-roll
        implementing eco roll and eco roll with engine stop. testcases with class 5 vehicle and simple cycles
        setting eco-roll data
        refactoring: remove deprecated underspeed from overspeed/ecoroll parameters, adding dedicated eco-roll input parameters
        moving and renaming declaration data field
        adding testdata for eco roll
        refactoring engineeringdriverdata: use separate data provider for ess and eco roll
      b06bf224
    • Markus QUARITSCH's avatar
      Merge branch 'develop' of... · 8be10cbd
      Markus QUARITSCH authored
      Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-dev into feature/VECTO-975-implementing-eco-roll-with-and-without-engine-stop
      
      # Conflicts:
      #	HashingTool/Properties/Version.cs
      #	VectoCommon/VectoCommon/Properties/Version.cs
      #	VectoCommon/VectoCommon/Resources/XMLNames.resx
      #	VectoCommon/VectoHashing/Properties/Version.cs
      #	VectoConsole/Properties/Version.cs
      #	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
      #	VectoCore/VectoCore/VersionNumber.t4
      8be10cbd
Loading