Skip to content

Commit

Permalink
Merge branch 'main' into benchmark
Browse files Browse the repository at this point in the history
  • Loading branch information
ZedongPeng authored Dec 5, 2023
2 parents c8eead9 + de96bef commit baa816c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pyomo/contrib/pyros/master_problem_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ def minimize_dr_vars(model_data, config):
nom_block = polishing_model.scenarios[0, 0]
if config.objective_focus == ObjectiveType.nominal:
obj_val = value(
this_iter.second_stage_objective + this_iter.first_stage_objective
nom_block.second_stage_objective + nom_block.first_stage_objective
)
polishing_model.scenarios[0, 0].polishing_constraint = Constraint(
expr=obj_val
Expand Down
2 changes: 1 addition & 1 deletion pyomo/neos/plugins/NEOS.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def create_command_line(self, executable, problem_files):
logger.info("Solver log file: '%s'" % (self._log_file,))
if self._soln_file is not None:
logger.info("Solver solution file: '%s'" % (self._soln_file,))
if self._problem_files is not []:
if self._problem_files != []:
logger.info("Solver problem files: %s" % (self._problem_files,))

return Bunch(cmd="", log_file=self._log_file, env="")
Expand Down
2 changes: 1 addition & 1 deletion pyomo/opt/base/convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def convert_problem(
if os.sep in fname: # pragma:nocover
fname = tmp.split(os.sep)[-1]
source_ptype = [guess_format(fname)]
if source_ptype is [None]:
if source_ptype == [None]:
raise ConverterError("Unknown suffix type: " + tmp)
else:
source_ptype = args[0].valid_problem_types()
Expand Down
2 changes: 1 addition & 1 deletion pyomo/opt/solver/shellcmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ def _apply_solver(self):
print("Solver log file: '%s'" % self._log_file)
if self._soln_file is not None:
print("Solver solution file: '%s'" % self._soln_file)
if self._problem_files is not []:
if self._problem_files != []:
print("Solver problem files: %s" % str(self._problem_files))

sys.stdout.flush()
Expand Down
6 changes: 3 additions & 3 deletions pyomo/version/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
# main and needs a hard reference to "suitably new" development.
major = 6
minor = 7
micro = 0
# releaselevel = 'invalid'
releaselevel = 'final'
micro = 1
releaselevel = 'invalid'
# releaselevel = 'final'
serial = 0

if releaselevel == 'final':
Expand Down

0 comments on commit baa816c

Please sign in to comment.