removed TO_SKIP list

Author: kostis-init

examples/csplib/prob001_convert_data.py

@@ -3,6 +3,8 @@
 See `prob001_car_sequence.py` for the actual model that uses the JSON data file
 """
 import json
+import os
+
 import numpy as np
 import re
 import sys
@@ -139,11 +141,15 @@ def parse_data(fname):
   if len(sys.argv) > 2:
     out = sys.argv[2]
 
-  problems = list(parse_data(fname))
-
+  # if fname file does not exist, end with a warning
+  if not os.path.exists(fname):
+    print(f"File {fname} does not exist. No data to convert.")
+  else:
+    problems = list(parse_data(fname))
+    # outstring = pprint.pformat(problems, indent=4, sort_dicts=False)
+    # outstring = outstring.replace("'",'"')
 
-  # outstring = pprint.pformat(problems, indent=4, sort_dicts=False)
-  # outstring = outstring.replace("'",'"')
+    with open(out, "w") as outfile:
+      json.dump(problems, outfile, cls=CompactJSONEncoder, indent=4)
 
-  with open(out, "w") as outfile:
-    json.dump(problems, outfile, cls=CompactJSONEncoder, indent=4)
+    print(f"Converted {len(problems)} problems to {out}")

tests/test_examples.py

@@ -19,13 +19,8 @@
 
 prefix = '.' if 'y' in getcwd()[-2:] else '..'
 
-TO_SKIP = [
-    "prob001_convert_data.py"
-]
-
 EXAMPLES = glob(join(prefix, "examples", "*.py")) + \
            glob(join(prefix, "examples", "csplib", "*.py"))
-EXAMPLES = [e for e in EXAMPLES if not any(x in e for x in TO_SKIP)]
 
 ADVANCED_EXAMPLES = glob(join(prefix, "examples", "advanced", "*.py"))
 
@@ -36,7 +31,9 @@
     "minizinc",
 ]
 
-@pytest.mark.parametrize(("solver", "example"), itertools.product(SOLVERS, EXAMPLES))  # run the test for each combination of solver and example
+
+# run the test for each combination of solver and example
+@pytest.mark.parametrize(("solver", "example"), itertools.product(SOLVERS, EXAMPLES))
 @pytest.mark.timeout(60)  # 60-second timeout for each test
 def test_example(solver, example):
     """Loads the example file and executes its __main__ block with the given solver being set as default.
@@ -45,7 +42,10 @@ def test_example(solver, example):
         solver ([string]): Loaded with parametrized solver name
         example ([string]): Loaded with parametrized example filename
     """
-    if solver in ('gurobi', 'minizinc') and any(x in example for x in ["npuzzle.py", "tst_likevrp.py", 'sudoku_', 'pareto_optimal.py', 'prob009_perfect_squares.py', 'blocks_world.py', 'flexible_jobshop.py']):
+    if solver in ('gurobi', 'minizinc') and any(x in example for x in
+                                                ["npuzzle.py", "tst_likevrp.py", 'sudoku_', 'pareto_optimal.py',
+                                                 'prob009_perfect_squares.py', 'blocks_world.py',
+                                                 'flexible_jobshop.py']):
         return pytest.skip(reason=f"exclude {example} for {solver}, too slow or solver-specific")
 
     base_solvers = SolverLookup.base_solvers
@@ -87,4 +87,4 @@ def test_advanced_example(example):
         if "CPM_exact".lower() in str(e).lower():
             pytest.skip(reason=f"Skipped, example uses Exact but is not installed, raised: {e}")
         else:
-            raise e
+            raise e