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

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

* commit '691e0916':
  Corrected access to GraphWriter in Test Projects when TRACE flag is off.

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

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

* commit '97f3a6fe':
  Buses\FactorMethod: removed accidentially checked in files from output bin-directory. Updated test data with latest version.
  Buses\FactorMethod: removed accidentially checked in files from output bin-directory. Updated test data with latest version.

Buses\FactorMethod: removed accidentially checked in files from output bin-directory. Updated test data with latest version.

Buses\FactorMethod: removed accidentially checked in files from output bin-directory. Updated test data with latest version.

Pull request #153: Feature/VECTO-1522 vecto warning if there are more steered axles than steering pump technologies

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1522-vecto-warning-if-there-are-more-steered-axles-than-steering-pump-technologies to develop

* commit '1b42c61b':
  adding steered axles to input provider, hand over number of steered axles to dataadapter aux-method.
  adding testcase checking number of steered axles matches number of steering pump technologies

adding steered axles to input provider, hand over number of steered axles to dataadapter aux-method.

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

* commit '16f7ab6e':
  updating release notes

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

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

* commit 'c9b6e221':
  correcting directory name of test files after changing schema namespace

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

* commit '88d6b468': (374 commits)
  fix validation testcase
  removing tests lo longer needed (exempted vehicles), fixing testcases
  separate ADAS input data and BusAux Input data for Conventional, HEV, PEV, IEPC into separate classes as different inputs are available
  re-adding adas tests and testdata, fixing several testcases
  adding tyre dimensions
  correcting sorting order in schema, removing double definition
  correcting aux technologies in xml schema
  renaming classnames from v210 to v24
  changing and renaming namespaces in code, updating more testfiles
  updating test-xml files and generic vehicles after namespace changes
  renaming XML schema for 2nd amendment to official namespace
  more work on reading xml, correcting testdata refactoring strucure of vehicle data provider for v2.10 vehicles
  refactoring reading modified XMLs for electric machines, refactoring reading PTO
  move continuous torque/overload torque to voltage levels (GUI), adapt code for saving EM, make code compile
  changing sample and test xml files after changes in PTO
  update PTO technologies
  removing impossible testfile
  update project after renaming file
  update test files after changes in schema
  adapt test data (xml) and generic vehicles (xml) due to changes in schema
  ...

separate ADAS input data and BusAux Input data for Conventional, HEV, PEV, IEPC into separate classes as different inputs are available

# Conflicts:
#	VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs
#	VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj

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

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

* commit '332ddfab':
  corrected test cases for P2 Hybrid Group 5 BatterySystem 2 DriveCycle  Interurban Short
  HybridResultEntry Improved DebuggerDisplay
  HybridStrategy.SelectBestOption: added emergency shift also for upshift
  HybridStrategy.DoSelectBestOption: When Braking search with MaxBY MechanicalAssistPower instead of MinBy
  added check for EngineSpeedTooHigh when shifting down
  updated testcases for TestFullCycleModDataIntegrityAT citybus AT Serial and Parallel: ShiftTime set to 1 second (instead of 0 which is wrong)
  removed check for ResponseEngineSpeedTooHigh from DistanceRun again
  removed check for ResponseEngineSpeedToHigh from DistanceRun again.
  updated testcases
  Updated Test Aux_SteeringPumpLookupValues
  Updated 4 Testcases: TestSimulationExemptedVehicle