diff --git a/Source/functions/AbstractionLayers/DestructionPower/DestructionPower.h b/Source/functions/AbstractionLayers/DestructionPower/DestructionPower.h index 288af80..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 3 +#define DESTRUCTION_COUNT 2 #include "DestructionPower_Properties.h" #include "../AbstraktionLayer_Base.h" diff --git a/Source/functions/AbstractionLayers/Layer_ColorMatching/AbstractionLayer_ColorMatching.cpp b/Source/functions/AbstractionLayers/Layer_ColorMatching/AbstractionLayer_ColorMatching.cpp index d998865..8f90b88 100644 --- a/Source/functions/AbstractionLayers/Layer_ColorMatching/AbstractionLayer_ColorMatching.cpp +++ b/Source/functions/AbstractionLayers/Layer_ColorMatching/AbstractionLayer_ColorMatching.cpp @@ -177,7 +177,7 @@ bool AbstractionLayer_ColorMatching::EvaluateQuality (const coor constraintCoord float value3 = (float)(1-(abs(m_constraintMatrix[constraintCoordinate.col][constraintCoordinate.row].m_centerColor.v-qVector[i].second->m_acm.m_centerColor.v))/255); - qVector[i].first = (value1*4+value2*2+value3*1)/6; + qVector[i].first = (value1*2+value2*2+value3*2)/6; } } diff --git a/Source/functions/solve/structure.cpp b/Source/functions/solve/structure.cpp index 5fa9924..fb0a773 100755 --- a/Source/functions/solve/structure.cpp +++ b/Source/functions/solve/structure.cpp @@ -169,9 +169,9 @@ bool backtrack(vector& log, Puzzle& puzzleMat) //remove similar in log - Part myPart = *log.back().PieceCollector[0].second;//tmpsaves bad part + //Part myPart = *log.back().PieceCollector[0].second;//tmpsaves bad part log.back().PieceCollector.erase(log.back().PieceCollector.begin());//removes bad part from log - puzzleMat.removeSimilar(log.back().PieceCollector,myPart); //removes all pieces from log that are similar to bad part + //puzzleMat.removeSimilar(log.back().PieceCollector,myPart); //removes all pieces from log that are similar to bad part //TODO reprogram similar removal to allow multilayer tracking if(log.back().PieceCollector.size()) // this checks if 'removeSimilar' has cleared entire LogElement { @@ -216,7 +216,7 @@ float capLogElements(vector& log) { // Till Now only ground structure -> incorrect variable ans vector names - double limit = 0.1; + double limit = 0.8; double diff = 0; int id=0;