This reverts commit 37001894.

Michael KRISPER authored 2 years ago and Markus Quaritsch committed 2 years ago

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:bugfix/P2HybridGroup5NoEssUrbanDelivery to develop

* commit '9c0699e6': (22 commits)
  DefaultDriverStrategy.HandleRequestEngaged: Added case for ResponseOverload situation: try Coast (fixed the problem at 22km in P2 G5 NoEE UrbanDelivery)
  DefaultDriverStrategy: Added more info to debugData for easier debugging. Reformated code
  GearshiftPositions: Corrected bug for HasPredecessor/HasSuccessor when GearPosition is 0
  DefaultDriverStrategy: Removed unneeded code from previous solution attempts (hamstercode)
  Driver: Code formatting
  IDriverStrategy: Added BrakeTrigger (forgot to include in previous commit)
  GearshiftPosition: reformatting and simplifying check for HasPredecessor and HasSucessor
  Renamed NextBrakeTargetSpeed to NextBrakeTriggerSpeed
  IDriverInfo: Added NextBrakeTriggerSpeed to detect braking to halt
  HybridStrategy: FindBestGearForBraking: added check if targetSpeed is actually 0 when checking for DisengageWhenHaltingSpeed. Otherwise braking below 10 km/h caused problems, because gearbox disengaged.
  typo
  Code formatting
  Driver: removed empty comment
  Driver ApplyLimit DriverAcceleration switched
  formatting
  DefaultDriverStrategy.DoBrake: Added debug variable for response history
  DefaultDriverStrategy.DoCoast: Combined declaration and initialisation
  Refactored if-statements for easier debugging
  code formatting
  HybridStrategy Request Refactored if-statements of nextGear for easier debugging
  ...

DefaultDriverStrategy.HandleRequestEngaged: Added case for ResponseOverload situation: try Coast (fixed the problem at 22km in P2 G5 NoEE UrbanDelivery)

HybridStrategy: FindBestGearForBraking: added check if targetSpeed is actually 0 when checking for DisengageWhenHaltingSpeed. Otherwise braking below 10 km/h caused problems, because gearbox disengaged.

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit 'c81c2109':
  additional sample xml for FWD gearbox
  adapting S2 APT-S testmodel, adapt transmission ratio em to be in a more reasonable speed range
  update expected value factor method
  correct sample xml file, update expected value
  include missing reource files
  no torque limits for PEV and Sx vehicles
  adapt model parameters for APT-P E2 Testcase so that the EM is in a more reasonable speed range

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit '0fd41bdd':
  renaming testcase, correcting assertions
  correcting more sample xml files
  handle the case that in the first simulation interval (if the vehicle does not start from standstill) no sulution is available aa
  fix testcase after updating driving cycle coach
  fix testcase multistage exempted bus
  update expected values in testcase
  bugfix for serial and pue electric vehicles: GearboxData.DisengageWhenHalting speed is not available - use constant as before

Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into develop

# Conflicts:
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/BatteryElectricMotorController.cs

Michael KRISPER authored 2 years ago and Markus Quaritsch committed 2 years ago

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:feature/VECTO-1540-axlegearinputretarder to develop

* commit '78589981': (93 commits)
  AbstractSimulationDataAdapter.SetCommonRetarderData: moved access to ratio back to the place when we are sure that the retarder exists.
  RetarderTest: Added additional test for creation of different retarder types and powertrainPositions
  AbstractSimulationDataAdapter: Added check for correct retarder positions
  JSONRetarderInputData: Removed check if retarder is allowed. Now it just reads the retarder, if it is defined in the file.
  Removed DummyRetarder
  UserManual: Added Axelgear Input Retarder in description
  JSONInputData: minor formatting
  JsonFileWriter: Reformated file and refactored to use collectioninitializer syntax
  Gearbox.vb: MockEngineeringVehicle: Removed readonly from VehicleType to set it in initializer
  VectoJob.vb: Corrected bug when gearboxInputData is nothing (e.g. E3)
  VectoJobForm: Corrected bug when GearboxInputData is empty (e.g. E3)
  BatteryElectricMotorController: Corrected Bug when GearboxModelData is null (e.g. E3)
  Added E3 and S3 Tests for Retarder
  BatteryElectricTest: Added Retarder to test cases
  Added example retarder in test case
  Formatting
  Code Formatting
  Added retarder test data
  merge again
  Resolve Conflicts while merge
  ...