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

added outputfuntion

Browse Source
This commit is contained in:
Raphael Maenle 2018-01-29 16:32:55 +01:00
parent df071457d0
commit a6da2298c8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/functions/AbstractionLayers/DestructionPower/DestructionPower.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
//TODO!! increase Destructioncount //TODO!! increase Destructioncount
#define DESTRUCTION_COUNT 4 #define DESTRUCTION_COUNT 2
#include "DestructionPower_Properties.h" #include "DestructionPower_Properties.h"
#include "../AbstraktionLayer_Base.h" #include "../AbstraktionLayer_Base.h"

8
Source/functions/solve/structure.cpp
View File

@ -81,14 +81,14 @@ void solve(vector<LogEntry>& log,Puzzle& puzzleMat)
case 0://pömpel case 0://pömpel
puzzleMat.a1.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); puzzleMat.a1.EvaluateQuality(log.back().myCoor,log.back().PieceCollector);
break; break;
case 1://SURFFeature case 3://SURFFeature
// return; // return;
puzzleMat.a4.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); puzzleMat.a4.EvaluateQuality(log.back().myCoor,log.back().PieceCollector);
break; break;
case 2://poempelposition case 2://poempelposition
puzzleMat.a3.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); puzzleMat.a3.EvaluateQuality(log.back().myCoor,log.back().PieceCollector);
break; break;
case 3://color case 1://color
puzzleMat.acm.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); puzzleMat.acm.EvaluateQuality(log.back().myCoor,log.back().PieceCollector);
break; break;
case -1://random case -1://random
@ -121,7 +121,7 @@ void setsolution(vector<LogEntry>& log, Puzzle& puzzleMat)
puzzleMat.setConstraints(log.back().myCoor,log.back().PieceCollector.begin()->second); puzzleMat.setConstraints(log.back().myCoor,log.back().PieceCollector.begin()->second);
cout << "set:" << log.back().myCoor.col << "," << log.back().myCoor.row << endl; cout << "set:" << log.back().myCoor.col << "," << log.back().myCoor.row << endl;
//cout << "ID: " << log.back().PieceCollector[0].second->GetPartID() << endl; //cout << "ID: " << log.back().PieceCollector[0].second->GetPartID() << endl;
if(log.back().myCoor.col>=31 && log.back().myCoor.row==5) if(log.back().myCoor.col>=3 && log.back().myCoor.row==2)
puzzleMat.resultImage(log); puzzleMat.resultImage(log);
} }
@ -192,7 +192,7 @@ float capLogElements(vector<LogEntry>& log)
{ {
// Till Now only ground structure -> incorrect variable ans vector names // Till Now only ground structure -> incorrect variable ans vector names
double limit = 0.6; double limit = 0.1;
double diff = 0; double diff = 0;
int id=0; int id=0;