This commit is contained in:
Azael
2017-03-21 00:17:26 +01:00
parent 9a24fe6356
commit 4e5983b5ce
2 changed files with 13 additions and 10 deletions

View File

@@ -15,7 +15,6 @@ public class Expression {
public Expression(){ public Expression(){
readExpression(); readExpression();
parse(); parse();
negExpressionPrefixe();
} }
public void readExpression(){ public void readExpression(){
@@ -103,7 +102,6 @@ public class Expression {
reversePrefix += stack.pollLast(); reversePrefix += stack.pollLast();
expressionPrefixe = reverseExpression(reversePrefix); expressionPrefixe = reverseExpression(reversePrefix);
System.out.println(expressionPrefixe);
} }
public String getExpression() { public String getExpression() {
@@ -114,12 +112,16 @@ public class Expression {
return expressionPrefixe; return expressionPrefixe;
} }
private void negExpressionPrefixe (){ public void negExpressionPrefixe (){
expressionPrefixe = "!" + expressionPrefixe; expressionPrefixe = "!" + expressionPrefixe;
} }
public static void main(String[] args) { public static void main(String[] args) {
Expression e = new Expression(); Expression e = new Expression();
e.negExpressionPrefixe();
System.out.println(e.getExpressionPrefixe());
System.out.println();
Tree t = new Tree(e.getExpressionPrefixe()); Tree t = new Tree(e.getExpressionPrefixe());
t.display(); t.display();
} }

View File

@@ -20,14 +20,14 @@ public class Tree {
Node f = new Node(null, fils, null, item, 1+fils.getLvl()); Node f = new Node(null, fils, null, item, 1+fils.getLvl());
fils.setFather(f); fils.setFather(f);
return f; return f;
} else {
Node filsG = tree(pos+1);
Node filsD = tree(pos+filsG.getLvl()+1);
Node f = new Node(null, filsG, filsD, item, filsG.getLvl() + filsD.getLvl()+1);
filsG.setFather(f);
filsD.setFather(f);
return f;
} }
Node filsG = tree(pos+1);
Node filsD = tree(pos+filsG.getLvl());
Node f = new Node(null, filsG, filsD, item, filsG.getLvl() + filsD.getLvl()+1);
filsG.setFather(f);
filsD.setFather(f);
return f;
} else { } else {
return new Node(null, null, null, item, 1); return new Node(null, null, null, item, 1);
} }
@@ -40,6 +40,7 @@ public class Tree {
private void displayNode(Node n, int lvl){ private void displayNode(Node n, int lvl){
for (int i = 0; i < lvl; i++) for (int i = 0; i < lvl; i++)
System.out.print("-"); System.out.print("-");
n.display(); n.display();
if (n.getLeftChild() != null) if (n.getLeftChild() != null)
displayNode(n.getLeftChild(),lvl+1); displayNode(n.getLeftChild(),lvl+1);