tests are ready to run?

Author: DLWoodruff

Diff for: .github/workflows/test_pr_and_main.yml

@@ -310,6 +310,34 @@ jobs:
           python test_pickle_bundle.py
 
 
+  mps:
+    name: MPS tests
+    runs-on: ubuntu-latest
+    needs: [ruff]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          activate-environment: test_env
+          python-version: 3.11
+          auto-activate-base: false
+      - name: Install dependencies
+        run: |
+          conda install mpi4py pandas setuptools
+          pip install pyomo xpress cplex mip
+
+      - name: setup the program
+        run: |
+          pip install -e .
+
+      - name: run MPS tests
+        timeout-minutes: 2
+        run: |
+          cd mpisppy/tests
+          python test_mps.py
+
+
   confidence-intervals:
     name: confidence intervals tests
     runs-on: ubuntu-latest
@@ -494,7 +522,7 @@ jobs:
         timeout-minutes: 10
         run: |
           cd mpisppy/tests
-          mpiexec -np 2 python -m mpi4py test_with_cylinders.py          
+          mpiexec -np 2 python -m mpi4py test_with_cylinders.py
 
   test-agnostic:
     name: tests on agnostic

Diff for: mpisppy/extensions/scenario_lp_mps_files.py

@@ -30,12 +30,11 @@ def pre_iter0(self):
         for k, s in self.ph.local_subproblems.items():
             s.write(f"{k}.lp", io_options={'symbolic_solver_labels': True})
             s.write(f"{k}.mps", io_options={'symbolic_solver_labels': True})
-            scenDict = {"scenProb": s._mpisppy_probability}  # to be added to
-            nodeDict = dict()
+            scenData = {"name": s.name, "scenProb": s._mpisppy_probability} 
+            scenDict = {"scenarioData": scenData}
             for nd in s._mpisppy_node_list:
-                nodeDict[nd.name] = {"condProb": nd.cond_prob}
-                nodeDict[nd.name].update({"nonAnts": [lpize(var.name) for var in nd.nonant_vardata_list]})
-            scenDict.update(nodeDict)
+                scenDict[nd.name] = {"condProb": nd.cond_prob}
+                scenDict[nd.name].update({"nonAnts": [lpize(var.name) for var in nd.nonant_vardata_list]})
             with open(f"{k}_nonants.json", "w") as jfile:
                 json.dump(scenDict, jfile, indent=2)
 

Diff for: mpisppy/utils/mps_module.py

@@ -53,15 +53,15 @@ def scenario_creator(sname, cfg=None):
     with open(jsonPath) as f:
         nonantDict = json.load(f)
     try:
-        scenProb = nonantDict["scenProb"]
+        scenProb = nonantDict["scenarioData"]["scenProb"]
     except Exception as e:
         raise RuntimeError(f'Error getting scenProb from {jsonPath}: {e}')
     assert "ROOT" in nonantDict, f'"ROOT" must be top node in {jsonPath}'
     treeNodes = list()
     parent_ndn = None   # counting on the json file to have ordered nodes
     stage = 1
     for ndn in nonantDict:
-        if ndn == "scenProb":   # non-nodename at top level of json
+        if ndn == "scenarioData":   # non-nodename at top level of json
             continue
         cp = nonantDict[ndn]["condProb"]
         nonants = [model.\
@@ -94,13 +94,20 @@ def scenario_names_creator(num_scens, start=None):
     # IMPORTANT: start is zero-based even if the names are one-based!
     mps_files = [os.path.basename(f)
                 for f in glob.glob(os.path.join(mps_files_directory, "*.mps"))]
+    mps_files.sort()
     if start == None:
         start = 0
     if num_scens == None:
         num_scens = len(mps_files) - start
     first = re.search(r"\d+$",mps_files[0][:-4])  # first scenario number
+    try:
+        first = int(first.group())
+    except Exception as e:
+        raise RuntimeError(f'mps files in {mps_files_directory} must end with an integer'
+                           f'found file {mps_files[0]} (error was: {e})')
+    
     print("WARNING: one-based senario names might cause trouble"
-          f" found {first} for file {os.path.join(mps_files_directory, mps_files[0])}")
+          f" found {first} for dir {mps_files_directory}")
     assert start+num_scens <= len(mps_files),\
         f"Trying to create scenarios names with {start=}, {num_scens=} but {len(mps_files)=}"
     retval = [fn[:-4] for fn in mps_files[start:start+num_scens]]