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

beforemerge

Browse Source
This commit is contained in:
Raphael Maenle
2017-12-22 22:55:55 +01:00
parent bfed4aba05
commit edd3c8620b
7 changed files with 195 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.cpp
View File

@ -7,9 +7,9 @@
#include <iostream>
void AbstractionLayer_1::PreProcessing(const vector<Part*>* partArray)
void AbstractionLayer_1::PreProcessing(coor mySize, const vector<Part*>* partArray)
{
InitialiseConstraintMatrixSize(32+2, 28+2);
InitialiseConstraintMatrixSize(mySize.row+2, mySize.col+2);
setEdgeZero();
}
@ -100,7 +100,7 @@ void AbstractionLayer_1::setEdgeZero()
{
for(int col=0;col<m_constraintMatrix.size();col++)
for(int row=0;row<m_constraintMatrix[col].size();row++)
if(col ==0 || col == m_constraintMatrix.size() || row == 0 || row == m_constraintMatrix[col].size())
if(col ==0 || col == m_constraintMatrix.size()-1 || row == 0 || row == m_constraintMatrix[col].size()-1)
m_constraintMatrix[col][row].m_connections=0b00000000;
}

2
Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.h
View File

@ -16,7 +16,7 @@
class AbstractionLayer_1 : public AbstractionLayer_Base<AbstractionLayer_1_Properties>
{
public:
void PreProcessing(const vector<Part*>* partArray);//override
void PreProcessing(coor mySize, const vector<Part*>* partArray) final;
bool EvaluateQuality (const coor constraintCoordinate, qualityVector& qVector);
bool SetConstraintOnPosition(const coor constraintCoordinate, const AbstractionLayer_1_Properties constraint);
bool RemoveConstraintOnPosition(const coor constraintCoordinate);