code: added flag 3 - 6 feature

Author: Nischay-Pro

generator/generate.py

@@ -47,6 +47,10 @@ def main():
             printOuterConditionValue(index,globaldata,hashtable)
             printOuterConditionValue(index,globaldata,hashtable)
 
+    for index, item in enumerate(hashtable[1:]):
+        if(getFlag(index,globaldata)==1):
+            globaldata = setPosDeltaFlags(index,globaldata,hashtable,10000) #Threshold for Flag 3 - 6
+
     for index, item in enumerate(hashtable[1:]):
         if(getFlag(index,globaldata)==1):
             conditionValueFixForYPos(index,globaldata,hashtable,15)

generator/interior.py

@@ -326,4 +326,25 @@ def printPosDeltaConditions(index,globaldata,hashtable,threshold):
     initialConditionValueYNeg = getInteriorConditionValueofYNeg(index,globaldata,hashtable)
     dSPointYNeg = getDYNegPoints(index,globaldata,hashtable)
     if(initialConditionValueXNeg > threshold or initialConditionValueXPos > threshold or initialConditionValueYPos > threshold or initialConditionValueYNeg > threshold):
-        print(index,len(dSPointXPos),initialConditionValueXPos,len(dSPointXNeg),initialConditionValueXNeg,len(dSPointYPos),initialConditionValueYPos,len(dSPointYNeg),initialConditionValueYNeg)
+        print(index,len(dSPointXPos),initialConditionValueXPos,len(dSPointXNeg),initialConditionValueXNeg,len(dSPointYPos),initialConditionValueYPos,len(dSPointYNeg),initialConditionValueYNeg)
+
+def setPosDeltaFlags(index,globaldata,hashtable,threshold):
+    initialConditionValueXPos = getInteriorConditionValueofXPos(index,globaldata,hashtable)
+    dSPointXPos = getDXPosPoints(index,globaldata,hashtable)
+    initialConditionValueXNeg = getInteriorConditionValueofXNeg(index,globaldata,hashtable)
+    dSPointXNeg = getDXNegPoints(index,globaldata,hashtable)
+    initialConditionValueYPos = getInteriorConditionValueofYPos(index,globaldata,hashtable)
+    dSPointYPos = getDYPosPoints(index,globaldata,hashtable)
+    initialConditionValueYNeg = getInteriorConditionValueofYNeg(index,globaldata,hashtable)
+    dSPointYNeg = getDYNegPoints(index,globaldata,hashtable)
+    if(initialConditionValueXPos > threshold):
+        globaldata = setFlagValue(index,7,1,globaldata)
+    if(initialConditionValueXNeg > threshold):
+        globaldata = setFlagValue(index,8,1,globaldata)
+    if(initialConditionValueYPos > threshold):
+        globaldata = setFlagValue(index,9,1,globaldata)    
+    if(initialConditionValueYNeg > threshold):
+        globaldata = setFlagValue(index,10,1,globaldata)
+    return globaldata
+        
+        

generator/load.py

@@ -27,6 +27,10 @@ def loadWall(geometrydata):
             walldata.insert(4,index+1)
             walldata.insert(5,0)
             walldata.insert(6,1)
+            walldata.insert(7,0)
+            walldata.insert(8,0)
+            walldata.insert(9,0)
+            walldata.insert(10,0)
             globaldata.append(walldata)
             index+=1
         # Last Point    
@@ -38,6 +42,10 @@ def loadWall(geometrydata):
             walldata.insert(4,1)
             walldata.insert(5,0)
             walldata.insert(6,1)
+            walldata.insert(7,0)
+            walldata.insert(8,0)
+            walldata.insert(9,0)
+            walldata.insert(10,0)
             globaldata.append(walldata)
             index+=1
         # Other Points
@@ -49,6 +57,10 @@ def loadWall(geometrydata):
             walldata.insert(4,index+1)
             walldata.insert(5,0)
             walldata.insert(6,1)
+            walldata.insert(7,0)
+            walldata.insert(8,0)
+            walldata.insert(9,0)
+            walldata.insert(10,0)
             globaldata.append(walldata)
             index+=1
     print("Wall Point Processed")
@@ -91,6 +103,10 @@ def loadInterior(data,hashtable,globaldata,index):
                 cleandata.pop(0)        
                 cleandata.insert(0,cleandata[len(cleandata)-1])
                 cleandata.pop(-1)
+                cleandata.insert(0,0)
+                cleandata.insert(0,0)
+                cleandata.insert(0,0)
+                cleandata.insert(0,0)
                 cleandata.insert(0,1)
                 cleandata.insert(0,1)
                 cleandata.insert(0,0)
@@ -107,6 +123,10 @@ def loadInterior(data,hashtable,globaldata,index):
                 cleandata.pop(0)        
                 cleandata.insert(0,cleandata[len(cleandata)-1])
                 cleandata.pop(-1)
+                cleandata.insert(0,0)
+                cleandata.insert(0,0)
+                cleandata.insert(0,0)
+                cleandata.insert(0,0)
                 cleandata.insert(0,1)
                 cleandata.insert(0,1)
                 cleandata.insert(0,0)

generator/misc.py

@@ -5,15 +5,15 @@ def cleanNeighbours(globaldata): # Verified
     print("Beginning Duplicate Neighbour Detection")
     for i in range(len(globaldata)):
         printProgressBar(i, len(globaldata) - 1, prefix = 'Progress:', suffix = 'Complete', length = 50)
-        noneighours = int(globaldata[i][7]) # Nuber of neighbours
+        noneighours = int(globaldata[i][11]) # Number of neighbours
         cordneighbours = globaldata[i][-noneighours:]
 
         # TODO - Ask, why get the same thing as above?
         cordneighbours = [str(float(i.split(",")[0])) + "," + str(float(i.split(",")[1])) for i in cordneighbours]
 
         cordneighbours = dict.fromkeys(cordneighbours).keys()
         noneighours = len(cordneighbours)
-        globaldata[i] = globaldata[i][:7] + [noneighours] + list(cordneighbours)
+        globaldata[i] = globaldata[i][:11] + [noneighours] + list(cordneighbours)
         # with open("duplication_removal.txt", "w") as text_file:
         #     for item1 in globaldata:
         #         text_file.writelines(["%s " % item for item in item1])
@@ -31,10 +31,10 @@ def getIndexOf(pointxy,hashtable):
 def getNeighbours(indexval,list):
     val = []
     pointdata = list[indexval]
-    numbneigh = int(pointdata[7])
+    numbneigh = int(pointdata[11])
     try:
         for i in range(numbneigh):
-            val = val + [str(pointdata[i+8])]
+            val = val + [str(pointdata[i+12])]
     except Exception:
         pass
     return val
@@ -156,6 +156,10 @@ def getRightPoint(cord,globaldata,hashtable):
     else:
         return hashtable.index(rightpt)
 
+def setFlagValue(index,flagindex,value,globaldata):
+    globaldata[index][flagindex] = value
+    return globaldata
+
 def takeFirst(elem):
     return elem[0]
 
@@ -167,12 +171,12 @@ def euclideanDistance(a,b):
     return (float(math.sqrt(((bx-ax)**2)+((by-ay)**2))),a)
 
 def appendNeighbours(neighbours,index,globaldata):
-    nbhcount = int(globaldata[index][7])
+    nbhcount = int(globaldata[index][11])
     nbhs = globaldata[index][-nbhcount:]
     nbhs = nbhs + neighbours
     nbhcount = nbhcount + len(neighbours)
-    globaldata[index][7] = nbhcount
-    globaldata[index] = globaldata[index][:8] + nbhs
+    globaldata[index][11] = nbhcount
+    globaldata[index] = globaldata[index][:12] + nbhs
     return "Done"
 
 def cleanWallPoints(neighbours,wallpoint):