bug fixes and more

.github/workflows/python.yml

@@ -1,32 +1,31 @@
 name: Python
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 permissions:
   contents: read
 
 jobs:
   build:
-
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.10"
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-    - name: Test with unittest
-      run: |
-         python -m unittest discover -s src/tests
-    - name: Generate Artifacts
-      run:  pyinstaller --onefile src/cli/main.py
-    - name: Archive Artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: predimate-artifacts
-        path: ./dist
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.10"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+      - name: Test with unittest
+        run: |
+          python -m unittest discover -s src/tests
+      - name: Generate Artifacts
+        run: pyinstaller --onefile src/cli/main.py -p .
+      - name: Archive Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: predimate-artifacts
+          path: ./dist

requirements.txt

@@ -1,4 +1,2 @@
 pyinstaller
-texttable
-igraph
-plotly
+texttable

src/cli/main.py

@@ -1,15 +1,13 @@
-from texttable import Texttable
-
 from src.data.encode import encode_expression
 from src.cli.truth_table import generate_truth_table
 
 
 def print_main_header():
-    header = """
+    header = r"""
       _____              _ _                 _       
      |  __ \            | (_)               | |      
      | |__) | __ ___  __| |_ _ __ ___   __ _| |_ ___ 
-     |  ___/ '__/ _ \/ _` | | '_ ` _ \ / _` | __/ _ \\
+     |  ___/ '__/ _ \/ _` | | '_ ` _ \ / _` | __/ _ \
      | |   | | |  __/ (_| | | | | | | | (_| | ||  __/
      |_|   |_|  \___|\__,_|_|_| |_| |_|\__,_|\__\___|
     """
@@ -35,7 +33,7 @@ def parse_input(item, prepositions, expressions):
         expressions.append(wrapped)
 
     for prep in list(filter(lambda char: char.isalpha() and char != 'v', item)):
-        if prep not in prepositions:
+        if prep.upper() not in prepositions:
             prepositions.append(prep.upper())
 
 

src/data/encode.py

@@ -45,7 +45,7 @@ def encode_expression(expr: str) -> Base:
                     i = j
                 else:
                     j = find_end(expr[i:]) + i + 1
-                    sub_result = encode_expression(expr[i:])
+                    sub_result = encode_expression(expr[i:j])
                     i = j
 
                 result.append(Negation(sub_result))