master > master: code py - VERSION up (minor)

- Abdunkeln in Summen jetzt nicht bei Werten

code/python/assets/config.yaml

@@ -30,3 +30,5 @@ options:
       - TREE
   rucksack:
     verbose: true
+    show:
+      - ALL-WEIGHTS

code/python/dist/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

code/python/docs/config/Models/AppOptions.md

@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **tarjan** | [**AppOptions_tarjan**](AppOptions_tarjan.md) |  | [default to null]
 **tsp** | [**AppOptions_tarjan**](AppOptions_tarjan.md) |  | [default to null]
 **hirschberg** | [**AppOptions_hirschberg**](AppOptions_hirschberg.md) |  | [default to null]
-**rucksack** | [**AppOptions_tarjan**](AppOptions_tarjan.md) |  | [optional] [default to null]
+**rucksack** | [**AppOptions_rucksack**](AppOptions_rucksack.md) |  | [optional] [default to null]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

code/python/docs/config/Models/AppOptionsRucksack.md

@@ -0,0 +1,10 @@
+# AppOptionsRucksack
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**verbose** | [**Boolean**](boolean.md) |  | [optional] [default to false]
+**show** | [**List**](EnumRucksackShow.md) |  | [optional] [default to []]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

code/python/docs/config/Models/EnumRucksackShow.md

@@ -0,0 +1,8 @@
+# EnumRucksackShow
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

code/python/docs/config/README.md

@@ -15,11 +15,13 @@ Class | Method | HTTP request | Description
  - [AppOptions](.//Models/AppOptions.md)
  - [AppOptionsHirschberg](.//Models/AppOptionsHirschberg.md)
  - [AppOptionsHirschbergMovePriorities](.//Models/AppOptionsHirschbergMovePriorities.md)
+ - [AppOptionsRucksack](.//Models/AppOptionsRucksack.md)
  - [AppOptionsTarjan](.//Models/AppOptionsTarjan.md)
  - [Config](.//Models/Config.md)
  - [EnumHirschbergShow](.//Models/EnumHirschbergShow.md)
  - [EnumHirschbergVerbosity](.//Models/EnumHirschbergVerbosity.md)
  - [EnumLogLevel](.//Models/EnumLogLevel.md)
+ - [EnumRucksackShow](.//Models/EnumRucksackShow.md)
  - [Info](.//Models/Info.md)
 
 

code/python/models/commands-schema.yaml

@@ -1,6 +1,6 @@
 openapi: 3.0.3
 info:
-  version: 0.1.0
+  version: 0.2.0
   title: Schemata for command instructions
 servers:
   - url: "."

code/python/models/config-schema.yaml

@@ -1,6 +1,6 @@
 openapi: 3.0.3
 info:
-  version: 0.1.0
+  version: 0.2.0
   title: Schemata for config models
 servers:
   - url: "."
@@ -53,7 +53,7 @@ components:
         - tsp
         - tarjan
         - hirschberg
-        - rucksack-branch-and-bound
+        - rucksack
       properties:
         log-level:
           $ref: '#/components/schemas/EnumLogLevel'
@@ -117,12 +117,16 @@ components:
               default: []
         rucksack:
           type: object
-          required:
-            - verbose
+          required: []
           properties:
             verbose:
               type: boolean
               default: false
+            show:
+              type: array
+              items:
+                $ref: '#/components/schemas/EnumRucksackShow'
+              default: []
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # Enum LogLevel
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -148,8 +152,17 @@ components:
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     EnumHirschbergShow:
       description: |-
-        Enumeration of verbosity options for Hirschberg
+        Enumeration of display options for Hirschberg
       type: string
       enum:
         - TREE
         - ATOMS
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    # Enum Rucksack - display options
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    EnumRucksackShow:
+      description: |-
+        Enumeration of display options for the Rucksack problem
+      type: string
+      enum:
+        - ALL-WEIGHTS

code/python/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uni-leipzig-ads-2-2022"
-version = "1.0.0"
+version = "0.2.0"
 description = "Zusatzcode, um Algorithmen und Datenstrukturen im Kurs ADS2 zu demonstrieren."
 authors = [ "Raj Dahya" ]
 maintainers = [ "raj_mathe" ]

code/python/src/algorithms/rucksack/algorithms.py

@@ -83,7 +83,7 @@ def rucksack_greedy_algorithm(
 
     # verbose output hier behandeln (irrelevant für Algorithmus):
     if verbose:
-        repr_rucksack = display_rucksack(items=items[rucksack], costs=costs[rucksack], values=values[rucksack], choice=np.asarray(choice)[rucksack]);
+        repr_rucksack = display_rucksack(items=items, costs=costs, values=values, choice=choice);
         print('\x1b[1mEingeschätzte Lösung\x1b[0m');
         print('');
         print(f'Mask: [{", ".join(map(str, soln.choice))}]');
@@ -173,7 +173,7 @@ def rucksack_branch_and_bound_algorithm(
     # verbose output hier behandeln (irrelevant für Algorithmus):
     if verbose:
         repr = display_branch_and_bound(values=values, steps=logged_steps);
-        repr_rucksack = display_rucksack(items=items[rucksack], costs=costs[rucksack], values=values[rucksack], choice=np.asarray(mask.choice)[rucksack]);
+        repr_rucksack = display_rucksack(items=items, costs=costs, values=values, choice=mask.choice);
         print(repr);
         print('');
         print('\x1b[1mLösung\x1b[0m');

code/python/src/algorithms/rucksack/display.py

@@ -9,6 +9,8 @@ from src.thirdparty.code import *;
 from src.thirdparty.maths import *;
 from src.thirdparty.types import *;
 
+from src.setup import config;
+from models.generated.config import *;
 from src.models.stacks import *;
 from src.models.rucksack import *;
 
@@ -62,9 +64,17 @@ def display_rucksack(
     items: np.ndarray,
     costs: np.ndarray,
     values: np.ndarray,
-    choice: np.ndarray,
+    choice: List[Fraction],
 ) -> str:
+    show_options = config.OPTIONS.rucksack.show;
     render = lambda r: f'{r:g}';
+    choice = np.asarray(choice);
+    rucksack = np.where(choice > 0);
+    if not(EnumRucksackShow.all_weights in show_options):
+        items = items[rucksack];
+        costs = costs[rucksack];
+        values = values[rucksack];
+        choice = choice[rucksack];
     table = pd.DataFrame({
         'items':  items.tolist() + ['----', '∑'],
         'nr':  list(map(str, choice))
@@ -132,15 +142,22 @@ def display_sum(
     indexes: List[int] = [],
     as_maximum: bool = True,
 ) -> str:
+    show_options = config.OPTIONS.rucksack.show;
+    show_all_weights = (EnumRucksackShow.all_weights in show_options);
+
     def render(x: Tuple[bool, Fraction, float]):
         b, u, value = x;
-        expr = f'\x1b[91m{value:g}\x1b[0m' if b else f'\x1b[2m{value:g}\x1b[0m';
-        return expr if u == 1 else f'\x1b[4;2m{u}\x1b[0m\x1b[2m·\x1b[0m{expr}';
+        expr = f'\x1b[91m{value:g}\x1b[0m' if b else f'\x1b[0m{value:g}\x1b[0m';
+        if not show_all_weights and u == 1:
+            return expr;
+        return f'\x1b[2m{u}\x1b[0m\x1b[2m·\x1b[0m{expr}';
 
     parts = [ (i in indexes, u, x) for i, (u, x) in enumerate(zip(choice, values)) ];
     if not (order is None):
         parts = [ parts[j] for j in order ];
-    parts = list(filter(lambda x: x[1] > 0, parts));
+    if not show_all_weights:
+        parts = list(filter(lambda x: x[1] > 0, parts));
+
     value = sum([ u*x for _, u, x in parts ]);
     expr = '\x1b[2m+\x1b[0m'.join(map(render, parts));