Merge pull request #22 from krr-up/nico/convert

Nico/convert

examples/coom/city-bike.coom

@@ -1,6 +1,6 @@
 // City Bike example
 // Provided by denkbares GmbH
-// see Baumeister et al.: Towards Industrial-scale Product Configuration (2024). To appear.
+// see Baumeister et al.: Towards Industrial-scale Product Configuration (2024).
 
 product {
 	        Color   color

examples/coom/kids-bike.coom

@@ -1,6 +1,6 @@
 // Kids Bike example
 // Provided by denkbares GmbH
-// see Baumeister et al.: Towards Industrial-scale Product Configuration (2024). To appear.
+// see Baumeister et al.: Towards Industrial-scale Product Configuration (2024).
 
 product {
 	Color   color

examples/coom/travel-bike-simplified.coom

@@ -1,6 +1,6 @@
 // Simplified Travel Bike example
 // Provided by denkbares GmbH
-// see Baumeister et al.: Towards Industrial-scale Product Configuration (2024). To appear.
+// see Baumeister et al.: Towards Industrial-scale Product Configuration (2024).
 
 product {
     num .#/l	0-200   totalVolume

examples/coom/travel-bike.coom

@@ -1,6 +1,6 @@
 // Travel Bike example
 // Provided by denkbares GmbH
-// see Baumeister et al.: Towards Industrial-scale Product Configuration (2024). To appear.
+// see Baumeister et al.: Towards Industrial-scale Product Configuration (2024).
 
 product {
     num .#/g	1-10000 totalWeight

src/coomsuite/__init__.py

@@ -15,23 +15,24 @@
 SOLVERS = ["clingo", "fclingo"]
 
 
-def convert_instance(coom_file: str, output_dir: Optional[str] = None) -> str:  # nocoverage
+def convert_instance(coom_file: str, outdir: Optional[str] = None) -> str:  # nocoverage
     """
     Converts a COOM instance into ASP
     Args:
         coom_file (str): COOM file .coom
         output_dir (str, optional): Name of the output directory, by default the same of coom_file is used
     """
-    output_dir = "" if output_dir is None else output_dir
-    filename = splitext(basename(coom_file))[0] + "-coom.lp"
-    output_lp_file = join(output_dir, filename)
-
     input_stream = FileStream(coom_file, encoding="utf-8")
-    asp_instance = run_antlr4_visitor(input_stream)
-    asp_instance = [f"coom_{a}" if a != "" else a for a in asp_instance]
-
-    with open(output_lp_file, "w", encoding="utf8") as f:
-        f.write("\n".join(asp_instance))
-        f.write("\n")
-    log.info("ASP file saved in %s", output_lp_file)
-    return output_lp_file
+    asp_instance = "\n".join([f"coom_{a}" if a != "" else a for a in run_antlr4_visitor(input_stream)])
+
+    if outdir is not None:
+        filename = splitext(basename(coom_file))[0] + "-coom.lp"
+        output_lp_file = join(outdir, filename)
+
+        with open(output_lp_file, "w", encoding="utf8") as f:
+            f.write(asp_instance)
+            f.write("\n")
+        log.info("ASP file saved in %s", output_lp_file)
+        return output_lp_file
+
+    return asp_instance

src/coomsuite/__main__.py

@@ -29,8 +29,10 @@ def main():
     # log.error("error")
 
     if args.command == "convert":
-        output_lp_file = convert_instance(args.input, args.output)
-        log.info("ASP file saved in %s", output_lp_file)
+        asp_instance = convert_instance(args.input, args.output)
+        if args.output is None:
+            print(asp_instance)
+
     elif args.command == "solve":
         log.info("Converting and solving COOM file %s", args.input)
         with TemporaryDirectory() as temp_dir:

src/coomsuite/utils/parser.py

@@ -67,13 +67,16 @@ def get(levels: list[tuple[str, int]], name: str) -> Optional[int]:
     parser_convert.add_argument(
         "input",
         type=str,
-        help="Input the COOM file corresponding to the instance.",
+        help="""
+        Input the COOM file corresponding to the instance. Converted instance is printed to console by default.
+        Specify output directory with '--output' to save .""",
     )
     parser_convert.add_argument(
         "--output",
         "-o",
         type=str,
-        help="Path to output directory. Same directory as input by default.",
+        default=None,
+        help="Path to output directory. (Optional)",
     )
 
     # -------------
@@ -90,10 +93,6 @@ def get(levels: list[tuple[str, int]], name: str) -> Optional[int]:
     )
     parser_solve.add_argument("--solver", "-s", type=str, help="Set solver", choices=SOLVERS, default="clingo")
 
-    # parser_solve.add_argument(
-    #     "--profile", "-p", type=str, help="Set COOM profile", choices=COOM_PROFILES, default="all"
-    # )
-
     parser_solve.add_argument(
         "--output", "-o", type=str, help="Set console output format", choices=["asp", "coom"], default="asp"
     )