diff --git a/code/python/main.py b/code/python/main.py index cc084b1..0d2962a 100644 --- a/code/python/main.py +++ b/code/python/main.py @@ -29,11 +29,13 @@ def enter(*args: str): # Führe befehle in Assets aus: for command in config.COMMANDS: result = api.run_command(command); - log.log_result(result, debug=True); # ignored if log-level >> DEBUG + # ignored if log-level >> DEBUG + log.log_result(result, debug=True); else: # Führe CLI-Befehl aus: result = api.run_command_from_json(args[0]); - log.log_result(result, debug=True); # ignored if log-level >> DEBUG + # ignored if log-level >> DEBUG + log.log_result(result, debug=True); return; # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/code/python/src/algorithms/hirschberg/algorithms.py b/code/python/src/algorithms/hirschberg/algorithms.py index 06fd1b4..618b2da 100644 --- a/code/python/src/algorithms/hirschberg/algorithms.py +++ b/code/python/src/algorithms/hirschberg/algorithms.py @@ -32,7 +32,6 @@ def simple_algorithm( X: str, Y: str, verbose: List[EnumHirschbergVerbosity] = [], - show: List[EnumHirschbergShow] = [], ) -> Tuple[str, str]: ''' Dieser Algorithmus berechnet die Edit-Distanzen + optimale Richtungen ein Mal. @@ -50,7 +49,6 @@ def simple_algorithm( def hirschberg_algorithm( X: str, Y: str, - once: bool = False, verbose: List[EnumHirschbergVerbosity] = [], show: List[EnumHirschbergShow] = [], ) -> Tuple[str, str]: @@ -64,10 +62,6 @@ def hirschberg_algorithm( Daraus wird unmittelbar ein optimales Alignment bestimmt. Des Weiteren werden Zeitkosten durch Divide-and-Conquer klein gehalten. ''' - # ggf. nur den simplen Algorithmus ausführen: - if once: - return simple_algorithm(X=X, Y=Y, verbose=verbose, show=show); - align = hirschberg_algorithm_step(X=X, Y=Y, depth=1, verbose=verbose, show=show); word_x = align.as_string1(); word_y = align.as_string2(); diff --git a/code/python/src/setup/config.py b/code/python/src/setup/config.py index 7cee18f..b424f11 100644 --- a/code/python/src/setup/config.py +++ b/code/python/src/setup/config.py @@ -47,7 +47,7 @@ def create_commands(path: str) -> List[Command]: # pragma: no cover assets = yaml_load(fp, Loader=yaml_FullLoader); return [ interpret_command(Command(**instruction)) - for instruction in assets + for instruction in assets or [] ]; # use lazy loaing to ensure that values only loaded (once) when used