standarize agnostic to use inner_bound

bknueven · bknueven · commit b5105c3cbac8 · 2025-06-17T09:48:43.000-06:00
diff --git a/mpisppy/agnostic/ampl_guest.py b/mpisppy/agnostic/ampl_guest.py
@@ -270,7 +270,7 @@ def solve_one(self, Ag, s, solve_keyword_args, gripe, tee=False, need_solution=T
             if gripe:
                 print (f"Solve failed for scenario {s.name} on rank {global_rank}")
                 print(f"{gs.solve_result =}")
-            s._mpisppy_data._obj_from_agnostic = None
+            s._mpisppy_data.inner_bound = None
             return
 
         else:
@@ -289,7 +289,7 @@ def solve_one(self, Ag, s, solve_keyword_args, gripe, tee=False, need_solution=T
         if gd["sense"] == pyo.minimize:
             s._mpisppy_data.outer_bound = objval - mipgap
         else:
-            s._mpisppy_data.inner_bound = objval + mipgap
+            s._mpisppy_data.outer_bound = objval + mipgap
 
         # copy the nonant x values from gs to s so mpisppy can use them in s
         # in general, we need more checks (see the pyomo agnostic guest example)
@@ -311,7 +311,7 @@ def solve_one(self, Ag, s, solve_keyword_args, gripe, tee=False, need_solution=T
 
             s._mpisppy_data.nonant_indices[ndn_i]._value = gxvar.value()
 
-        s._mpisppy_data._obj_from_agnostic = objval
+        s._mpisppy_data.inner_bound = objval
 
 
     # local helper
diff --git a/mpisppy/agnostic/examples/farmer_gurobipy_model.py b/mpisppy/agnostic/examples/farmer_gurobipy_model.py
@@ -200,7 +200,7 @@ def solve_one(Ag, s, solve_keyword_args, gripe, tee, need_solution=True):
         s._mpisppy_data.nonant_indices[ndn_i]._value = grb_var.X
     
     # Store the objective function value in the host scenario
-    s._mpisppy_data._obj_from_agnostic = objval
+    s._mpisppy_data.inner_bound = objval
 
     # Additional checks and operations for bundling if needed (depending on the problem)
     # ...
diff --git a/mpisppy/agnostic/gams_guest.py b/mpisppy/agnostic/gams_guest.py
@@ -204,7 +204,7 @@ def solve_one(self, Ag, s, solve_keyword_args, gripe, tee, need_solution=True):
             if gripe:
                 print (f"Solve failed for scenario {s.name} on rank {global_rank}")
                 print(f"{gs.model_status =}")
-            s._mpisppy_data._obj_from_agnostic = None
+            s._mpisppy_data.inner_bound = None
             return
 
         if solver_exception is not None and need_solution:
@@ -248,7 +248,7 @@ def solve_one(self, Ag, s, solve_keyword_args, gripe, tee, need_solution=True):
             s._mpisppy_data.outer_bound = objval
 
         # the next line ignores bundling
-        s._mpisppy_data._obj_from_agnostic = objval
+        s._mpisppy_data.inner_bound = objval
 
         # TBD: deal with other aspects of bundling (see solve_one in spopt.py)
         #print(f"For {s.name} in {global_rank=}: {objval=}")
diff --git a/mpisppy/agnostic/pyomo_guest.py b/mpisppy/agnostic/pyomo_guest.py
@@ -262,7 +262,7 @@ def solve_one(self, Ag, s, solve_keyword_args, gripe, tee=False, need_solution=T
                 s._mpisppy_data.nonant_indices[ndn_i]._value = gxvar._value
 
             # the next line ignore bundles (other than proper bundles)
-            s._mpisppy_data._obj_from_agnostic = pyo.value(sputils.get_objs(gs)[0])
+            s._mpisppy_data.inner_bound = pyo.value(sputils.get_objs(gs)[0])
 
 
     # local helper
diff --git a/mpisppy/spopt.py b/mpisppy/spopt.py
@@ -421,7 +421,7 @@ def Eobjective(self, verbose=False):
                 local_Eobjs.append(s._mpisppy_probability * pyo.value(objfct))
             else:
                 # Agnostic will have attached the objective (and doesn't bundle as of Aug 2023)
-                local_Eobjs.append(s._mpisppy_probability * s._mpisppy_data._obj_from_agnostic)              
+                local_Eobjs.append(s._mpisppy_probability * s._mpisppy_data.inner_bound)
             if verbose:
                 print ("caller", inspect.stack()[1][3])
                 print ("E_Obj Scenario {}, prob={}, Obj={}, ObjExpr={}"\
