From 3ae27ebc138408e8e375b704ae6fd817de1a32c3 Mon Sep 17 00:00:00 2001 From: Raphael Maenle <17550607+g-spacewhale@users.noreply.github.com> Date: Tue, 30 Jan 2018 19:04:07 +0100 Subject: [PATCH] all layers activated beware --- .../AbstractionLayers/DestructionPower/DestructionPower.h | 2 +- Source/functions/solve/structure.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/functions/AbstractionLayers/DestructionPower/DestructionPower.h b/Source/functions/AbstractionLayers/DestructionPower/DestructionPower.h index f51fc35..071ea72 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 2 +#define DESTRUCTION_COUNT 5 #include "DestructionPower_Properties.h" #include "../AbstraktionLayer_Base.h" diff --git a/Source/functions/solve/structure.cpp b/Source/functions/solve/structure.cpp index 9a66c18..2f217d4 100755 --- a/Source/functions/solve/structure.cpp +++ b/Source/functions/solve/structure.cpp @@ -105,14 +105,14 @@ void solve(vector& log,Puzzle& puzzleMat) case 0://pömpel puzzleMat.a1.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); break; - case 4://SURFFeature + case 1://SURFFeature // return; puzzleMat.a4.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); break; case 3://poempelposition puzzleMat.a3.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); break; - case 1://color + case 4://color puzzleMat.acm.EvaluateQuality(log.back().myCoor,log.back().PieceCollector); break; case 2://KantenLaenge @@ -148,7 +148,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; - puzzleMat.resultImage(log); + //puzzleMat.resultImage(log); }