Commit 4c65bd45 authored by Aurelien Dufour's avatar Aurelien Dufour
Browse files

modification représentation arbres

parent 4949cc8b

controller/planarTreeToBinaryTree.py

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ class PlanarTreeToBinaryTree(LevelController): 


    def addNode(self, index: int, nodeType: str):

        if self.level.checkTree(index, nodeType):

            print("ouiiiiiiiiiiii")

            print(self.level.tree.root)

            self.levelGui.treeView.drawTree()

            if self.level.finished():

                self.levelGui.finish()

diagrammes/.~lock.algoDePlacement.odt#

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
,21915980,C304L-406C10.campus.unicaen.fr,24.05.2022 14:00,file:///home/21915980/.config/libreoffice/4;
 
 No newline at end of file

model/levelDyckWordToBinaryTree.py

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ class LevelDyckWordToBinaryTree(Level): 


    def checkTree(self, index: int, nodeType: str):

        copy = self.tree.copyTree()

        copy.root.addNode(index, nodeType)

        copy.addNode(index, nodeType)

        if self.answer.root.checkNode(copy.root):

            self.tree.addNode(index, nodeType)

            return True

model/levelEnum.py

+1 −1
Original line number Diff line number Diff line
@@ -37,4 +37,4 @@ def getTree(level): 
    elif level == 3:

        return Levels.Lvl3.value

    else:

        return Tree(randomTree(int(math.log(level) * 3)))
 
 No newline at end of file
 
        return Tree(randomTree(level + 1))
 
 No newline at end of file

model/levelPlanarTreeToBinaryTree.py

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ class LevelPlanarTreeToBinaryTree(Level): 


    def initialize(self):

        self.score = 100

        self.tree = Tree(BinaryNode(EmptyNode(), EmptyNode()))

        self.tree = Tree(EmptyNode())



    def nextLevel(self):

        return LevelPlanarTreeToBinaryTree(self.index + 1)
@@ -29,9 +29,9 @@ class LevelPlanarTreeToBinaryTree(Level): 


    def checkTree(self, index: int, nodeType: str):

        copy = self.tree.copyTree()

        copy.root.addNode(index, nodeType)

        copy.addNode(index, nodeType)

        if self.binaryAnswer.root.checkNode(copy.root):

            self.tree.addNode(index, nodeType)

            self.tree = copy

            return True

        else:

            return False