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

Skip to content
Snippets Groups Projects
  1. Apr 14, 2020
  2. Apr 10, 2020
  3. Apr 09, 2020
    • Markus QUARITSCH's avatar
      make it compile after merge · d4b0135c
      Markus QUARITSCH authored
      d4b0135c
    • Markus QUARITSCH's avatar
      Merge branch 'DevReleases/v0.6.0.1884' into feature/VECTO-1190-d-m-heavy-busesK · c6807a05
      Markus QUARITSCH authored
      # Conflicts:
      #	VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
      #	VectoCommon/VectoCommon/BusAuxiliaries/BusHVACSystemConfiguration.cs
      #	VectoCommon/VectoCommon/BusAuxiliaries/ISSMInputs.cs
      #	VectoCommon/VectoCommon/Models/VehicleCategory.cs
      #	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
      #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs
      #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs
      #	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
      #	VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
      #	VectoCore/VectoCore/Resources/Declaration/Buses/ElectricConsumers.csv
      #	VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
      #	VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
      c6807a05
    • Markus QUARITSCH's avatar
      d211a01e
  4. Apr 08, 2020
  5. Apr 07, 2020
  6. Apr 06, 2020
  7. Apr 03, 2020
  8. Apr 02, 2020
    • Franz KOBER josef's avatar
      7a002883
    • Franz KOBER josef's avatar
      Minor change at xml component reader to make RetarderType and RetarderRatio... · 63ae89e0
      Franz KOBER josef authored
      Minor change at  xml component reader to make RetarderType and RetarderRatio accessible over components.RetarderInputData interface, change related test accordingly
      63ae89e0
    • Markus QUARITSCH's avatar
      Merge pull request #12 in VECTO/vecto-dev from... · 950aba64
      Markus QUARITSCH authored
      Merge pull request #12 in VECTO/vecto-dev from ~EMQUARIMA/vecto-dev:bugfix/VECTO-1248-deviations-summary-vecto-dev-0.6.0.1884-scania-cv-ab to Releases/v0.6.0.1884
      
      * commit '4d6b7088':
        added technology info for bus aux  (ES, HVAC, PS); move door drive technology from aux to vehicle
        removing door drive technology from auxiliaries (already present at vehicle level)
        fix: divide by 0 when computing deceleration distance
        adding co2 per person-km to mrf/cif output
        fix: wrong output of passengercount in .vsum, MRF, and derived results (CO2 per passenger km etc.)
        fix: handle case when max cooling power for driver and passenger is 0 => set COP to 1 (avoid division 0/0)
        fix bonus for LED lights (single bus)
        busAux: fix typo in mechanical clutch for pneumatic system
        update fan powerdemand according to master-Excel file
        update allowed fan technologies for primary bus in XSD
      950aba64
Loading