From a6da2298c8401fdf3176864ca1c69a2fbb8e6be6 Mon Sep 17 00:00:00 2001 From: Raphael Maenle <17550607+g-spacewhale@users.noreply.github.com> Date: Mon, 29 Jan 2018 16:32:55 +0100 Subject: [PATCH] added outputfuntion --- .../AbstractionLayers/DestructionPower/DestructionPower.h | 2 +- Source/functions/solve/structure.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/functions/AbstractionLayers/DestructionPower/DestructionPower.h b/Source/functions/AbstractionLayers/DestructionPower/DestructionPower.h index 918f2a0..f51fc35 100644 --- a/Source/functions/AbstractionLayers/DestructionPower/DestructionPower.h +++ b/Source/functions/AbstractionLayers/DestructionPower/DestructionPower.h @@ -1,6 +1,6 @@ #pragma once //TODO!! increase Destructioncount -#define DESTRUCTION_COUNT 4 +#define DESTRUCTION_COUNT 2 #include "DestructionPower_Properties.h" #include "../AbstraktionLayer_Base.h" diff --git a/Source/functions/solve/structure.cpp b/Source/functions/solve/structure.cpp index 6197c38..7653fd3 100755 --- a/Source/functions/solve/structure.cpp +++ b/Source/functions/solve/structure.cpp @@ -81,14 +81,14 @@ void solve(vector& log,Puzzle& puzzleMat) case 0://pömpel puzzleMat.a1.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); break; - case 1://SURFFeature + case 3://SURFFeature // return; puzzleMat.a4.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); break; case 2://poempelposition puzzleMat.a3.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); break; - case 3://color + case 1://color puzzleMat.acm.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); break; case -1://random @@ -121,7 +121,7 @@ void setsolution(vector& log, Puzzle& puzzleMat) puzzleMat.setConstraints(log.back().myCoor,log.back().PieceCollector.begin()->second); cout << "set:" << log.back().myCoor.col << "," << log.back().myCoor.row << 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); } @@ -192,7 +192,7 @@ float capLogElements(vector& log) { // Till Now only ground structure -> incorrect variable ans vector names - double limit = 0.6; + double limit = 0.1; double diff = 0; int id=0;