master > master: code-py - refactoring von config/models

- manche command-optionen wie verbosity nach config.yaml umgezogen.

code/python/models/commands-schema.yaml

@@ -62,9 +62,6 @@ components:
               type: number
         optimise:
           $ref: '#/components/schemas/EnumTSPOptimise'
-        verbose:
-          type: boolean
-          default: false
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # Command - Algorithm: Hirschberg
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -87,16 +84,6 @@ components:
         once:
           type: boolean
           default: false
-        verbose:
-          type: array
-          items:
-            $ref: '#/components/schemas/EnumHirschbergVerbosity'
-          default: []
-        show:
-          type: array
-          items:
-            $ref: '#/components/schemas/EnumHirschbergShow'
-          default: []
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # Enum Algorithm Names
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -118,23 +105,3 @@ components:
       enum:
         - MIN
         - MAX
-    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    # Enum Hirschberg - Verbosity options
-    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    EnumHirschbergVerbosity:
-      description: |-
-        Enumeration of verbosity options for Hirschberg
-      type: string
-      enum:
-        - COSTS
-        - MOVES
-    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    # Enum Hirschberg - display options
-    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    EnumHirschbergShow:
-      description: |-
-        Enumeration of verbosity options for Hirschberg
-      type: string
-      enum:
-        - TREE
-        - ATOMS

code/python/models/config-schema.yaml

@@ -47,3 +47,49 @@ components:
       description: |-
         Options pertaining to the rudimentary setup of the app.
       type: object
+      properties:
+        tsp:
+          type: object
+          properties:
+            verbose:
+              type: boolean
+              default: false
+        hirschberg:
+          type: object
+          properties:
+            penality-missmatch:
+              type: number
+              default: 1
+            penality-gap:
+              type: number
+              default: 1
+            verbose:
+              type: array
+              items:
+                $ref: '#/components/schemas/EnumHirschbergVerbosity'
+              default: []
+            show:
+              type: array
+              items:
+                $ref: '#/components/schemas/EnumHirschbergShow'
+              default: []
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    # Enum Hirschberg - Verbosity options
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    EnumHirschbergVerbosity:
+      description: |-
+        Enumeration of verbosity options for Hirschberg
+      type: string
+      enum:
+        - COSTS
+        - MOVES
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    # Enum Hirschberg - display options
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    EnumHirschbergShow:
+      description: |-
+        Enumeration of verbosity options for Hirschberg
+      type: string
+      enum:
+        - TREE
+        - ATOMS