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

removed surf layer

Browse Source
This commit is contained in:
Raphael Maenle 2018-01-29 20:25:33 +01:00
parent 9f876e5c34
commit 564053797a
3 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 3 #define DESTRUCTION_COUNT 2
#include "DestructionPower_Properties.h" #include "DestructionPower_Properties.h"
#include "../AbstraktionLayer_Base.h" #include "../AbstraktionLayer_Base.h"

2
Source/functions/AbstractionLayers/Layer_ColorMatching/AbstractionLayer_ColorMatching.cpp
View File

@ -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); 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;
} }
} }

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

@ -169,9 +169,9 @@ bool backtrack(vector<LogEntry>& log, Puzzle& puzzleMat)
//remove similar in log //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 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 //TODO reprogram similar removal to allow multilayer tracking
if(log.back().PieceCollector.size()) // this checks if 'removeSimilar' has cleared entire LogElement if(log.back().PieceCollector.size()) // this checks if 'removeSimilar' has cleared entire LogElement
{ {
@ -216,7 +216,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.1; double limit = 0.8;
double diff = 0; double diff = 0;
int id=0; int id=0;