rm-archive/PuzzleSolver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed qualityVector from map to vector of pairs

Browse Source 
This change is better for the dispatcher, as he can sort the qualityvector now easily by the quality of each part
This commit is contained in:
TabDragon
2018-01-02 13:59:16 +01:00
parent ce6fc0db72
commit 4f9f43991c
4 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/functions/AbstractionLayers/AbstraktionLayer_Base.h
View File

@ -1,13 +1,12 @@
#ifndef SOURCE_ABSTRAKTIONLAYER_BASE_H
#define SOURCE_ABSTRAKTIONLAYER_BASE_H
#include <map>
#include <vector>
#include "../../header/input.h"
using namespace std;
typedef map<Part*, float> qualityVector;
typedef vector<pair<float, Part*>> qualityVector;
/*
* Die Logik mit der Template-Basisklasse und den abgeleiteten Layern kam mit der Idee, dass die Layer

2
Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.cpp
View File

@ -46,7 +46,7 @@ bool AbstractionLayer_1::EvaluateQuality (const coor constraintCoordinate, quali
{
for(auto it = qVector.begin(); it != qVector.end(); it++)
{
if(PlaceOfPartGood(constraintCoordinate, it->first->m_a1.m_connections))
if(PlaceOfPartGood(constraintCoordinate, it->second->m_a1.m_connections))
continue;
qVector.erase(it++);
}