Merge branch 'Team_CMU_MergeBase' of https://github.com/MMRVZ2017/MPK.Puzzle into Team_CMU_MergeBase

Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.cpp

@@ -36,11 +36,11 @@ bool AbstractionLayer_1::RemoveConstraintOnPosition(const coor constraintCoordin
 
 bool AbstractionLayer_1::CreateRandomPuzzle()
 {
-    std:: minstd_rand simple_rand;
+    std::minstd_rand simple_rand;
     simple_rand.seed((unsigned int)"dumbo");
 
-    for(int col=1;col<m_constraintMatrix.size()-1;col++){
-        for(int row=1;row<m_constraintMatrix[col].size()-1;)
+    for(int col = 1; col < m_constraintMatrix.size()-1; col++){
+        for(int row = 1; row < (m_constraintMatrix[col].size() - 1);)
         {
             //create random piece
             uint8_t tempPiece = 0b00000000;
@@ -76,7 +76,10 @@ bool AbstractionLayer_1::CreateRandomPuzzle()
 
             //set piece if piece good
             if(PlaceOfPartGood(coor(col,row),tempPiece))
-                row++;
+            {
+                row++; // Sollte er hier nicht das Puzzleteil irgendwo abspeichern? Weiß aber nicht ob die constraint layer der richtige platz ist, oder nicht eine neue, bzw. die puzzlebox
+                m_constraintMatrix[col][row].m_connections = tempPiece;
+            }
         }
     }
 
@@ -98,9 +101,9 @@ qualityVector AbstractionLayer_1::returnInBox(vector<Part>& PuzzleBox)
 
 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()-1 || row == 0 || row == m_constraintMatrix[col].size()-1)
+    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() - 1) || row == 0 || row == (m_constraintMatrix[col].size() - 1))
                 m_constraintMatrix[col][row].m_connections=0b00000000;
 }
 

Source/functions/solve/puzzleExtension.cpp

@@ -20,7 +20,7 @@ void Puzzle::putIntoBox()
         {
             //TODO! add rotation of all parts
             //TODO! add id to every part (how)
-            tmpPart.m_test1=this->a1->m_constraintMatrix[i][j];
+            tmpPart.m_test1=this->a1.m_constraintMatrix[i][j];
             //TODO! add all other layers here
             myBox.emplace_back(tmpPart);
         }
@@ -36,14 +36,15 @@ void Puzzle::shuffle()
 //deletes all constraints from all abstractionlayers
 void Puzzle::removeConstrains(coor removeCoordinates)
 {
-    this->a1->RemoveConstraintOnPosition(removeCoordinates);
+    this->a1.RemoveConstraintOnPosition(removeCoordinates);
 }
 
 void Puzzle::createRandomPuzzle()
 {
-    a1->CreateRandomPuzzle();
+    a1.CreateRandomPuzzle();
 }
 
 void Puzzle::createp_box()
 {
+
 }

Source/functions/solve/structure.cpp

@@ -74,7 +74,7 @@ void solve(vector<LogEntry>& log, vector<Part*>& p_Box, Puzzle& puzzleMat)
     switch(log.back().abstractionLevel)
     {
         case 1:
-            puzzleMat.a1->EvaluateQuality(log.back().myCoor, log.back().PieceCollector);
+            puzzleMat.a1.EvaluateQuality(log.back().myCoor, log.back().PieceCollector);
         break;
 
         default:

Source/header/solve.h

@@ -39,18 +39,18 @@ private:
 class Puzzle
 {
 public:
-    Puzzle(unsigned int newcols,unsigned int newrows,DestructionPower* newdp,AbstractionLayer_1):rows(newrows),cols(newcols)
+
+    Puzzle(unsigned int newcols,unsigned int newrows):rows(newrows),cols(newcols)
     {
-        dp=newdp;
-        a1->PreProcessing({rows,cols}, nullptr);//because could not set nullptr as default in override
-        dp->PreProcessing({rows,cols},nullptr);
+        a1.InitialiseConstraintMatrixSize(newcols+2, newrows+2);
+        a1.setEdgeZero();
     }
 
     coor getSizeAsCoor()
     {return {cols,rows};}
 
-    DestructionPower* dp;
-    AbstractionLayer_1* a1;
+    DestructionPower dp;
+    AbstractionLayer_1 a1;
 
     void removeConstrains(coor removeCoordinates);
     void printPuzzle();