Added finding expression level with tests

Added expression paren simplifier with tests
Added expression tree generation without tests yet
Added GUI for importing boolean expressions

Author: wojtekkw10

TODO

@@ -57,6 +57,7 @@ TODO: import as Canonical
 TO BE DONE:
 
 TODO: minimization algorithm
+TODO: aggregate circuit DTO
 
 MAYBE:
 TODO: ctrl-z, ctrl-shift-z - way too hard

build.gradle

@@ -16,30 +16,22 @@ plugins {
 
     //Apply the jlink plugin to add support for creating custom runtime images
     id "org.beryx.jlink" version "2.19.0"
+
+    //Apply the ANTLR java parser generator plugin
+    id 'antlr'
 }
 
 repositories {
     // Use jcenter for resolving dependencies.
     jcenter()
 }
 
-/*run {
-jvmArgs = {
-    "--add-exports=javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix",

-        "--add-exports=javafx.controls/com.sun.javafx.scene.control=com.jfoenix",

-        "--add-exports=javafx.base/com.sun.javafx.binding=com.jfoenix",
-    "--add-exports=javafx.graphics/com.sun.javafx.stage=com.jfoenix",
-    "--add-exports=javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix"
-}
-*//*
    jvmArgs = [

-
-]*//*
-
}*/
-
 dependencies {
     // This dependency is used by the application.
     implementation 'com.google.guava:guava:28.2-jre'
-    implementation 'com.jfoenix:jfoenix:9.0.8'
+
+    // Java parser generator
+    antlr "org.antlr:antlr4:4.7.2"
 
     // Use JUnit test framework
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.2'
@@ -57,6 +49,11 @@ dependencies {
 
 }
 
+generateGrammarSource {
+    outputDirectory = file("src/main/java/LogicCircuitSimulator/BooleanExpressionParser/GrammarParser")
+    arguments += ["-visitor", "-long-messages"]
+}
+
 java {
     sourceCompatibility = JavaVersion.VERSION_14
     targetCompatibility = JavaVersion.VERSION_14

jfoenix-9.0.8.jar

@@ -0,0 +1,31 @@
+grammar BooleanExpr;
+@header {
+    package LogicCircuitSimulator.BooleanExpressionParser.GrammarParser;
+}
+
+
+BLANK:         [ \t\r\n] -> skip;
+AND:           'AND';
+OR:            'OR';
+
+LEFT_PAREN:     '(';
+RIGHT_PAREN:    ')';
+NOT:            'NOT';
+IDENTIFIER:      [a-zA-Z]+;
+
+booleanExpression   : orExpression EOF
+                     ;
+
+orExpression        : orExpression OR andExpression
+                     | andExpression
+                     ;
+
+
+andExpression       : andExpression AND valueExpression
+                     | valueExpression
+                     ;
+
+valueExpression     : IDENTIFIER
+                     | NOT orExpression
+                     | LEFT_PAREN orExpression RIGHT_PAREN
+                     ;

src/main/antlr/BooleanExpr.g4

@@ -0,0 +1,7 @@
+package LogicCircuitSimulator.BooleanExpressionParser;
+
+import LogicCircuitSimulator.FxGUI.CircuitGrid.FXMLController.SelectionDTO;
+
+public interface BooleanExpressionParser{
+    SelectionDTO parse(String expression);
+}

src/main/java/LogicCircuitSimulator/BooleanExpressionParser/BooleanExpressionParser.java

@@ -0,0 +1,40 @@
+package LogicCircuitSimulator.BooleanExpressionParser.BooleanExpressionTree;
+
+public class ExpressionNode {
+    private ExpressionNode firstNode;
+    private ExpressionNode secondNode;
+    private String terminalText;
+    private Operand operand;
+
+    public ExpressionNode getFirstNode() {
+        return firstNode;
+    }
+
+    public void setFirstNode(ExpressionNode firstNode) {
+        this.firstNode = firstNode;
+    }
+
+    public ExpressionNode getSecondNode() {
+        return secondNode;
+    }
+
+    public void setSecondNode(ExpressionNode secondNode) {
+        this.secondNode = secondNode;
+    }
+
+    public String getTerminalText() {
+        return terminalText;
+    }
+
+    public void setTerminalText(String terminalText) {
+        this.terminalText = terminalText;
+    }
+
+    public Operand getOperand() {
+        return operand;
+    }
+
+    public void setOperand(Operand operand) {
+        this.operand = operand;
+    }
+}

src/main/java/LogicCircuitSimulator/BooleanExpressionParser/BooleanExpressionTree/ExpressionNode.java

@@ -0,0 +1,5 @@
+package LogicCircuitSimulator.BooleanExpressionParser.BooleanExpressionTree;
+
+public interface ExpressionTreeGenerator {
+    ExpressionNode generate(String expression);
+}

src/main/java/LogicCircuitSimulator/BooleanExpressionParser/BooleanExpressionTree/ExpressionTreeGenerator.java

@@ -0,0 +1,74 @@
+package LogicCircuitSimulator.BooleanExpressionParser.BooleanExpressionTree;
+
+import LogicCircuitSimulator.BooleanExpressionParser.GrammarParser.BooleanExprBaseVisitor;
+import LogicCircuitSimulator.BooleanExpressionParser.GrammarParser.BooleanExprParser;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+public class ExpressionTreeGeneratorVisitor extends BooleanExprBaseVisitor<ExpressionNode> {
+
+    @Override
+    public ExpressionNode visitBooleanExpression(BooleanExprParser.BooleanExpressionContext ctx) {
+        return visitOrExpression(ctx.orExpression());
+    }
+
+    @Override
+    public ExpressionNode visitOrExpression(BooleanExprParser.OrExpressionContext ctx) {
+        if(ctx.OR() != null){
+            ExpressionNode node = new ExpressionNode();
+            node.setOperand(Operand.OR);
+            ExpressionNode firstNode = visitOrExpression(ctx.orExpression());
+            ExpressionNode secondNode = visitAndExpression(ctx.andExpression());
+            node.setFirstNode(firstNode);
+            node.setSecondNode(secondNode);
+            return node;
+        }
+        else{
+            return visitAndExpression(ctx.andExpression());
+        }
+    }
+
+    @Override
+    public ExpressionNode visitAndExpression(BooleanExprParser.AndExpressionContext ctx) {
+        if(ctx.AND() != null){
+            ExpressionNode node = new ExpressionNode();
+            node.setOperand(Operand.AND);
+            ExpressionNode firstNode = visitAndExpression(ctx.andExpression());
+            ExpressionNode secondNode = visitValueExpression(ctx.valueExpression());
+            node.setFirstNode(firstNode);
+            node.setSecondNode(secondNode);
+            return node;
+        }
+        else{
+            return visitValueExpression(ctx.valueExpression());
+        }
+    }
+
+    @Override
+    public ExpressionNode visitValueExpression(BooleanExprParser.ValueExpressionContext ctx) {
+        if(ctx.NOT() != null){
+            ExpressionNode node = new ExpressionNode();
+            node.setOperand(Operand.NOT);
+            ExpressionNode firstNode = visitOrExpression(ctx.orExpression());
+            node.setFirstNode(firstNode);
+            return node;
+        }
+        else if(ctx.LEFT_PAREN() != null){
+            ExpressionNode node = new ExpressionNode();
+            ExpressionNode firstNode = visitOrExpression(ctx.orExpression());
+            node.setFirstNode(firstNode);
+            return node;
+        }
+        else{
+            ExpressionNode node  = new ExpressionNode();
+            node.setTerminalText(ctx.getText());
+            return node;
+        }
+    }
+
+    @Override
+    public ExpressionNode visitTerminal(TerminalNode node) {
+        ExpressionNode expressionNode = new ExpressionNode();
+        expressionNode.setTerminalText(node.getText());
+        return expressionNode;
+    }
+}

src/main/java/LogicCircuitSimulator/BooleanExpressionParser/BooleanExpressionTree/ExpressionTreeGeneratorVisitor.java

@@ -0,0 +1,7 @@
+package LogicCircuitSimulator.BooleanExpressionParser.BooleanExpressionTree;
+
+public enum Operand{
+    AND,
+    OR,
+    NOT
+}

src/main/java/LogicCircuitSimulator/BooleanExpressionParser/BooleanExpressionTree/Operand.java

@@ -0,0 +1,18 @@
+package LogicCircuitSimulator.BooleanExpressionParser.BooleanExpressionTree;
+
+import LogicCircuitSimulator.BooleanExpressionParser.GrammarParser.BooleanExprLexer;
+import LogicCircuitSimulator.BooleanExpressionParser.GrammarParser.BooleanExprParser;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.tree.ParseTree;
+
+public class SimpleExpressionTreeGenerator implements ExpressionTreeGenerator{
+    @Override
+    public ExpressionNode generate(String expression) {
+        BooleanExprLexer lexer = new BooleanExprLexer(CharStreams.fromString(expression));
+        BooleanExprParser parser = new BooleanExprParser(new CommonTokenStream(lexer));
+        ParseTree tree = parser.booleanExpression();
+        ExpressionTreeGeneratorVisitor treeGeneratorVisitor = new ExpressionTreeGeneratorVisitor();
+        return treeGeneratorVisitor.visit(tree);
+    }
+}