master > master: code -> aufräumung

code/data.env

@@ -1,9 +1,9 @@
-# expr = "A0"
-# expr = "! A0"
-# expr = "( A0 && A1 )"
-# expr = "( A0 || A1 )"
-# expr = "( A0 -> A1 )"
-expr = "( A0 -> ((A0 && A3 && A4) || ! A2) )"
-# expr = "( A0 -> ((A0 && A3) || A2) )"
-# expr = "(( {G} || !{G} ) -> A5)"
-interpretation = "[ 'A0', 'A2' ]"
+# expr = 'A0'
+# expr = '! A0'
+# expr = '( A0 && A1 )'
+# expr = '( A0 || A1 )'
+# expr = '( A0 -> A1 )'
+expr = '( A0 -> ((A0 && A3 && A4) || ! A2) )'
+# expr = '( A0 -> ((A0 && A3) || A2) )'
+# expr = '(( {G} || !{G} ) -> A5)'
+interpretation = '[ "A0", "A2" ]'

code/main.py

@@ -50,7 +50,6 @@ def main():
     display_results(expr, fml, I, results);
     return;
 
-
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # SONSTIGE METHODEN
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

code/run.sh

@@ -12,7 +12,7 @@ function call_python() {
     [ "$OSTYPE" == "msys" ] && py -3 $@ || python3 $@;
 }
 
-function run_check_requirements() {
+function check_requirements() {
     call_python -m pip install "$( cat requirements )" >> /dev/null;
 }
 
@@ -25,7 +25,7 @@ function run_code() {
 ################################
 
 # Kann auskommentiert werden, wenn nötige Module schon installiert:
-run_check_requirements;
+check_requirements;
 
 # Code ausführen:
-run_code
+run_code;

code/test.sh

@@ -12,7 +12,7 @@ function call_python() {
     [ "$OSTYPE" == "msys" ] && py -3 $@ || python3 $@;
 }
 
-function run_check_requirements() {
+function check_requirements() {
     call_python -m pip install "$( cat requirements )" >> /dev/null;
 }
 
@@ -32,7 +32,7 @@ function run_unittests(){
 ################################
 
 # Kann auskommentiert werden, wenn nötige Module schon installiert:
-run_check_requirements;
+check_requirements;
 
 # Code testen (unittests):
 run_unittests;