flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-20 12:35:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #820, using matching by score

Browse Source 
kept old function, allows to switch back
This commit is contained in:
Klaus Basan
2016-12-02 03:07:12 +01:00
parent add3aa5a74
commit 77f2e0ab06
2 changed files with 224 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackcore/aircraftmatcher.h
View File

@@ -48,8 +48,8 @@ namespace BlackCore
ByIcaoData = 1 << 1,
ByFamily = 1 << 2,
ByLivery = 1 << 3,
ByCombinedCode = 1 << 4,
All = ByModelString | ByIcaoData | ByFamily | ByLivery | ByCombinedCode
ByCombinedType = 1 << 4,
All = ByModelString | ByIcaoData | ByFamily | ByLivery | ByCombinedType
};
Q_DECLARE_FLAGS(MatchingMode, MatchingModeFlag)
@@ -112,6 +112,14 @@ namespace BlackCore
void setDefaultModel(const BlackMisc::Simulation::CAircraftModel &defaultModel);
private:
//! The search based implementation
//! \threadsafe
BlackMisc::Simulation::CAircraftModel getClosestMatchSearchImplementation(MatchingMode mode, const BlackMisc::Simulation::CAircraftModelList &modelSet, const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft, BlackMisc::CStatusMessageList *log = nullptr) const;
//! The search based implementation
//! \threadsafe
BlackMisc::Simulation::CAircraftModel getClosestMatchScoreImplementation(MatchingMode mode, const BlackMisc::Simulation::CAircraftModelList &modelSet, const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft, BlackMisc::CStatusMessageList *log = nullptr) const;
//! Search in models by key (aka model string)
//! \threadsafe
static BlackMisc::Simulation::CAircraftModel matchByExactModelString(const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft, const BlackMisc::Simulation::CAircraftModelList &models, BlackMisc::CStatusMessageList *log);
@@ -138,7 +146,7 @@ namespace BlackCore
//! Installed models by combined code (ie L2J, L1P, ...)
//! \threadsafe
static BlackMisc::Simulation::CAircraftModelList ifPossibleReduceByCombinedCode(const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft, const BlackMisc::Simulation::CAircraftModelList &inList, bool relaxIfNotFound, bool &reduced, BlackMisc::CStatusMessageList *log);
static BlackMisc::Simulation::CAircraftModelList ifPossibleReduceByCombinedCode(const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft, const BlackMisc::Simulation::CAircraftModelList &inList, bool &reduced, BlackMisc::CStatusMessageList *log);
//! By military flag
//! \threadsafe