Franz KOBER josef authored 2 years ago and Markus Quaritsch committed 2 years ago

Merge in VECTO/vecto-dev from VECTO/fk_vecto-dev:feature/VECTO-1578-create-json-input-data-for-iepc to develop

* commit '1e5ef50f':
  update testdata path
  added iepc json reader test
  added iepc json reader
  added example test data

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1583-extend-electric-motor-to-use-gear-dependent-powermap to develop

* commit '28d3a058':
  add gear dependency in electric power map
  switch more projects back to .net version 5 to make it compatible with VS 2019

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1577-define-inputdatainterfaces to develop

* commit '01d26d1e':
  adding generic IEPC json file
  define iepc engineering input data input data interface
  convert projects back to .net 5.0

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

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:merge/xEV-release-0.7.8 to develop

* commit 'b55ccc65': (28 commits)
  Release Notes PDF: Updated to current xEV release 0.7.8
  Release Notes: Added GUI changes for VECTO xEV Release 0.7.8.2579
  VectoCoreTest: Added global NUnit Configuration (Parallelizable) and for trial runs during debugging: LevelOfParallelism, Timeout
  DoubleExtensionMethods ToGUIFormat automatically round to 12 decimal digits to avoid floating-point-noise (e.g. 0.56 --> 0.5600000000000001)
  HybridStrategyParamsForm: Always Hide GenSetMinOptPower Factor field (Visible=False)
  JSONHybridStrategyParameters: Removed reading of GensetMinOptPowerFactor (defaults to 0 now)
  VectoJobForm: Visibility of Engine Stop/Start Fields
  Added Deploy Target and change TargetFramework settings to better work with Visual Studio
  HybridStrategyParamsForm: Further refinements with form initalisation
  HybridStrategyParams Form and REESSPackDialog Form: Changed enabled/disabled state in components
  HybridStrategyParams Form and REESSPackDialog Form: Changed enabled/disabled state in components
  Updated Version Number to 0.7.8 for xEV Release
  VehicleForm
  VectoJobForm: Enabled/Disabled Buttons, Enabled/Disabled Engine Stop/Start Group box
  VehicleForm: updated visibility of Engine Stop/Start, EcoRoll and ATLockupClutch components based on VehicleType (Conventional, HEV, BEV)
  HybridStrategy HandleCoastAction: Update CombustionEngineOn flag accordingly to the ICEoff flag (after setting it).
  VectoJobForm: Corrected typos in ADAS tab: Engie --> Engine, conrol --> control
  VehicleForm: Moved Back ADAS components as they were before
  VehicleForm: Enable/Disable field ATEcoRollLockupClutch and Cleaned up UpdateForm
  SearchAlgorithm: corrected display of search points
  ...

VectoCoreTest: Added global NUnit Configuration (Parallelizable) and for trial runs during debugging: LevelOfParallelism, Timeout

DoubleExtensionMethods ToGUIFormat automatically round to 12 decimal digits to avoid floating-point-noise (e.g. 0.56 --> 0.5600000000000001)

# Conflicts:
#	VECTO/GUI/VehicleForm.vb