woche12 > master: schemata - neue commands

code/python/models/commands-schema.yaml

@@ -115,11 +115,14 @@ components:
         Instructions for execution of Branch & Bound-Algorithm for the Rucksack-Problem
       type: object
       required:
+        - name
         - algorithm
         - max-cost
         - costs
         - values
       properties:
+        name:
+          $ref: '#/components/schemas/EnumAlgorithmNames'
         algorithm:
           $ref: '#/components/schemas/EnumRucksackAlgorithm'
         allow-fractional:
@@ -146,6 +149,42 @@ components:
           items:
             type: string
           default: []
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    # Algorithm: Euklidean algorithm
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    CommandEuklid:
+      description: |-
+        Instructions for execution of the Euklidean gcd-algorithm
+      type: object
+      required:
+        - name
+        - numbers
+      properties:
+        name:
+          $ref: '#/components/schemas/EnumAlgorithmNames'
+        numbers:
+          type: array
+          items:
+            type: integer
+            exclusiveMinimum: 0
+          minItems: 2
+          maxItems: 2
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    # Algorithm: Pollard's rho
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    CommandPollard:
+      description: |-
+        Instructions for execution of the Pollard's rho algorithm
+      type: object
+      required:
+        - name
+        - number
+      properties:
+        name:
+          $ref: '#/components/schemas/EnumAlgorithmNames'
+        number:
+          type: integer
+          exclusiveMinimum: 0
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # Enum Algorithm Names
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -158,6 +197,8 @@ components:
         - TSP
         - HIRSCHBERG
         - RUCKSACK
+        - EUKLID
+        - POLLARD-RHO
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # Enum Optimise Mode
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

code/python/models/config-schema.yaml

@@ -54,6 +54,8 @@ components:
         - tarjan
         - hirschberg
         - rucksack
+        - euklid
+        - pollard-rho
       properties:
         log-level:
           $ref: '#/components/schemas/EnumLogLevel'
@@ -127,6 +129,22 @@ components:
               items:
                 $ref: '#/components/schemas/EnumRucksackShow'
               default: []
+        euklid:
+          type: object
+          required:
+            - verbose
+          properties:
+            verbose:
+              type: boolean
+              default: false
+        pollard-rho:
+          type: object
+          required:
+            - verbose
+          properties:
+            verbose:
+              type: boolean
+              default: false
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # Enum LogLevel
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~