From 507533531ce37c3c255eb622232bbfcdf37c537d Mon Sep 17 00:00:00 2001
From: Raphael Maenle <17550607+g-spacewhale@users.noreply.github.com>
Date: Mon, 18 Dec 2017 22:50:03 +0100
Subject: [PATCH] unfinished merge, problems with randomgenerator

random generator in class needs to return a randomized puzzlebox
---
 .../Layer1/AbstractionLayer_1.cpp             | 90 ++++++++++++-------
 .../Layer1/AbstractionLayer_1.h               |  3 +-
 Source/header/solve.h                         |  1 +
 3 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.cpp b/Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.cpp
index a1cf9a9..d5cf7ba 100644
--- a/Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.cpp
+++ b/Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.cpp
@@ -13,12 +13,18 @@ void AbstractionLayer_1::PreProcessing(const vector<Part*>* partArray)
 
 bool AbstractionLayer_1::EvalueteQuality (const coor constraintCoordinate, qualityVector& qVector)
 {
-
+    for(int i=0;i<qVector.size();i++)
+    {
+        if(PlaceOfPartGood(constraintCoordinate, qVector[i].Part))
+            qVector[i].setQuality(1);
+        else
+            qVector[i].setQuality(0);
+    }
 }
 
 bool AbstractionLayer_1::SetConstraintOnPosition(const coor constraintCoordinate, const AbstractionLayer_1_Properties constraint)
 {
-
+    m_constraintMatrix[constraintCoordinate.col][constraintCoordinate.row]=
 }
 
 bool AbstractionLayer_1::RemoveConstraintOnPosition(const coor constraintCoordinate)
@@ -29,7 +35,7 @@ bool AbstractionLayer_1::RemoveConstraintOnPosition(const coor constraintCoordin
 bool AbstractionLayer_1::CreateRandomPuzzle()
 {
     for(int col=1;col<m_constraintMatrix.size()-1;col++){
-        for(int row=1;row<m_constraintMatrix[col].size()-1;row++)
+        for(int row=1;row<m_constraintMatrix[col].size()-1;)
         {
             uint8_t tempPiece = 0b00000000;
             if(rand()%2)
@@ -37,46 +43,24 @@ bool AbstractionLayer_1::CreateRandomPuzzle()
             else
                 tempPiece|=0b10000000;
 
-
+            if(rand()%2)
+                tempPiece|=0b00010000;
+            else
+                tempPiece|=0b00100000;
 
             if(rand()%2)
                 tempPiece|=0b00000100;
             else
                 tempPiece|=0b00001000;
 
-
-
-
-
-            if(m_constraintMatrix[col-1][row].m_connections != 0b00000000 || m_constraintMatrix[col-1][row].m_connections != 0b11111111)
-
-            {
-                tempPiece|=(0b00110000 xor (0b00110000 & m_constraintMatrix[col-1][row].m_connections));
-                //tempPiece.shift();
-            }
-            }
-                //add shift function
+            if(rand()%2)
+                tempPiece|=0b00000001;
             else
-            {
-                if(rand()%2)
-                    tempPiece|=0b00000001;
-                else
-                    tempPiece|=0b00000010;
-            }
-
-            if(m_constraintMatrix[col-1][row].m_connections != 0b00000000 || m_constraintMatrix[col-1][row].m_connections != 0b11111111)
-                tempPiece |= (0b00110000 xor (0b00110000 & m_constraintMatrix[col-1][row].m_connections));
-            else
-            {
-                if(rand()%2)
-                    tempPiece |= 0b00010000;
-                else
-                    tempPiece |= 0b00100000;
-            }
+                tempPiece|=0b00000010;
 
+            if(PlaceOfPartGood(coor(col,row),tempPiece))
+                row++;
         }
-
-    //insert temppuzzlepiece into matrix
     }
 
 }
@@ -89,3 +73,41 @@ void AbstractionLayer_1::setEdgeZero()
                 m_constraintMatrix[col][row].m_connections=0b00000000;
 }
 
+//checks if the myPart in its current orientation is legal in position m, n
+bool AbstractionLayer_1::PlaceOfPartGood(coor myCoor, uint8_t& myPart)
+{
+
+    uint8_t negativePart(0)=0b00000000;
+
+    negativePart or_eq (m_constraintMatrix[myCoor.col][myCoor.row+1].m_connections & 0b11000000);
+    negativePart or_eq (m_constraintMatrix[myCoor.col-1][myCoor.row].m_connections & 0b00110000);
+    negativePart or_eq (m_constraintMatrix[myCoor.col][myCoor.row-1].m_connections & 0b00001100);
+    negativePart or_eq (m_constraintMatrix[myCoor.col+1][myCoor.row].m_connections & 0b00000011);
+    shift(negativePart,2);
+    if  (
+            (    ((((negativePart & 0b11000000) ^ (myPart & 0b11000000))  != 0b00000000) && (((myPart & 0b11000000) != 0b00000000) && (negativePart & 0b11000000) != 0b00000000))
+                 || ((((negativePart & 0b11000000) == 0b11000000) || ((myPart &  0b11000000) == 0b11000000))  && (((myPart & 0b11000000) != 0b00000000) && (negativePart & 0b11000000) != 0b00000000))
+                 ||  (((negativePart & 0b11000000) == 0b00000000) && ((myPart &  0b11000000) == 0b00000000))  )
+            &&
+            (    ((((negativePart & 0b00110000) ^ (myPart & 0b00110000))  != 0b00000000) && (((myPart & 0b00110000) != 0b00000000) && (negativePart & 0b00110000) != 0b00000000))
+                 || ((((negativePart & 0b00110000) == 0b00110000) || ((myPart &  0b00110000) == 0b00110000))  && (((myPart & 0b00110000) != 0b00000000) && (negativePart & 0b00110000) != 0b00000000))
+                 ||  (((negativePart & 0b00110000) == 0b00000000) && ((myPart &  0b00110000) == 0b00000000))  )
+            &&
+            (    ((((negativePart & 0b00001100) ^  (myPart & 0b00001100))  != 0b00000000) && (((myPart & 0b00001100) != 0b00000000) && (negativePart & 0b00001100) != 0b00000000))
+                 || ((((negativePart & 0b00001100) == 0b00001100) || ((myPart &  0b00001100) == 0b00001100))  && (((myPart & 0b00001100) != 0b00000000) && (negativePart & 0b00001100) != 0b00000000))
+                 ||  (((negativePart & 0b00001100) == 0b00000000) && ((myPart &  0b00001100) == 0b00000000))  )
+            &&
+            (    ((((negativePart & 0b00000011) ^  (myPart & 0b00000011))  != 0b00000000)&& (((myPart & 0b00000011) != 0b00000000) && (negativePart & 0b00000011) != 0b00000000))
+                 || ((((negativePart & 0b00000011) == 0b00000011) || ((myPart &  0b00000011) == 0b00000011))  && (((myPart & 0b00000011) != 0b00000000) && (negativePart & 0b00000011) != 0b00000000))
+                 ||  (((negativePart & 0b00000011) == 0b00000000) && ((myPart &  0b00000011) == 0b00000000))  )
+            )
+        return true;
+    return false;
+
+}
+
+void AbstractionLayer_1::shift(uint8_t& Part, int shifts)
+{
+    Part = Part >> (shifts*2) | Part << sizeof(uint8_t)*8 - (shifts*2);
+}
+
diff --git a/Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.h b/Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.h
index 95f480e..31daab2 100644
--- a/Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.h
+++ b/Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.h
@@ -18,7 +18,8 @@ public:
     bool EvalueteQuality (const coor constraintCoordinate, qualityVector& qVector);
     bool SetConstraintOnPosition(const coor constraintCoordinate, const AbstractionLayer_1_Properties constraint);
     bool RemoveConstraintOnPosition(const coor constraintCoordinate);
-
+    bool PlaceOfPartGood(coor myCoor, uint8_t& myPart);
+    void shift(uint8_t& Part, int shifts);
     void setEdgeZero();
 
 
diff --git a/Source/header/solve.h b/Source/header/solve.h
index ad72406..a54d4ff 100755
--- a/Source/header/solve.h
+++ b/Source/header/solve.h
@@ -1,5 +1,6 @@
 #include <vector>
 #include <iostream>
+#include "input.h"
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>