master > master: code py - config optionen für richtungsprios

code/python/assets/commands.yaml

@@ -7,7 +7,7 @@
     [2, 7, 4, 0],
   ]
   optimise: MIN
-## Beispiele für Seminarwoche 10 (Blatt 9)
+# Beispiele für Seminarwoche 10 (Blatt 9)
 - name: HIRSCHBERG
   word1: 'happily ever after'
   word2: 'apples'

code/python/assets/config.yaml

@@ -9,8 +9,14 @@ options:
   tsp:
     verbose: true
   hirschberg:
-    penality-missmatch: 1
+    # standardwerte sind (1, 1) und (2, 1):
     penality-gap: 1
+    penality-mismatch: 1
+    # niedrigerer Wert ==> höhere Priorität:
+    move-priorities:
+      diagonal:   0
+      horizontal: 1
+      vertical:   2
     verbose:
       - COSTS
       - MOVES

code/python/models/config-schema.yaml

@@ -57,12 +57,27 @@ components:
         hirschberg:
           type: object
           properties:
-            penality-missmatch:
+            penality-mismatch:
               type: number
               default: 1
             penality-gap:
               type: number
               default: 1
+            move-priorities:
+              type: object
+              properties:
+                diagonal:
+                  type: integer
+                  minimum: 0
+                  default: 0
+                horizontal:
+                  type: integer
+                  minimum: 0
+                  default: 1
+                vertical:
+                  type: integer
+                  minimum: 0
+                  default: 2
             verbose:
               type: array
               items:

code/python/src/models/hirschberg/paths.py

@@ -23,6 +23,6 @@ __all__ = [
 class Directions(Enum):
     UNSET = -1;
     # Prioritäten hier setzen
-    DIAGONAL = 0;
-    HORIZONTAL = 1;
-    VERTICAL = 2;
+    DIAGONAL = OPTIONS.hirschberg.move_priorities.diagonal;
+    HORIZONTAL = OPTIONS.hirschberg.move_priorities.horizontal;
+    VERTICAL = OPTIONS.hirschberg.move_priorities.vertical;

code/python/src/models/hirschberg/penalties.py

@@ -25,4 +25,4 @@ def gap_penalty(x: str):
     return OPTIONS.hirschberg.penality_gap;
 
 def missmatch_penalty(x: str, y: str):
-    return 0 if x == y else OPTIONS.hirschberg.penality_missmatch;
+    return 0 if x == y else OPTIONS.hirschberg.penality_mismatch;