From 169acf3fe618335554a44a860dcc90f8a158a2c5 Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Wed, 29 Nov 2023 19:26:41 -0700 Subject: [PATCH 1/3] Resetting main for development (6.7.1.dev0) --- pyomo/version/info.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyomo/version/info.py b/pyomo/version/info.py index e38e844ad9b..cedb30c2dd4 100644 --- a/pyomo/version/info.py +++ b/pyomo/version/info.py @@ -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': From ada43df5138918e02309d0cfea26804ca500f3eb Mon Sep 17 00:00:00 2001 From: jasherma Date: Thu, 30 Nov 2023 19:45:07 -0500 Subject: [PATCH 2/3] Fix nominal focus DR polishing optimality constraint --- pyomo/contrib/pyros/master_problem_methods.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyomo/contrib/pyros/master_problem_methods.py b/pyomo/contrib/pyros/master_problem_methods.py index dc4b6b957bb..58583c65fba 100644 --- a/pyomo/contrib/pyros/master_problem_methods.py +++ b/pyomo/contrib/pyros/master_problem_methods.py @@ -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 From 04a8809c19f9f1e6a15ee157eae4a242ab878dbb Mon Sep 17 00:00:00 2001 From: asifhaider <1805112@ugrad.cse.buet.ac.bd> Date: Sun, 3 Dec 2023 06:08:28 +0600 Subject: [PATCH 3/3] Fixed Inappropriate Logical Expressions --- pyomo/neos/plugins/NEOS.py | 2 +- pyomo/opt/base/convert.py | 2 +- pyomo/opt/solver/shellcmd.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyomo/neos/plugins/NEOS.py b/pyomo/neos/plugins/NEOS.py index 2d5929fa9a1..85fad42d4b2 100644 --- a/pyomo/neos/plugins/NEOS.py +++ b/pyomo/neos/plugins/NEOS.py @@ -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="") diff --git a/pyomo/opt/base/convert.py b/pyomo/opt/base/convert.py index 972239a65cd..8d8bd78e2ee 100644 --- a/pyomo/opt/base/convert.py +++ b/pyomo/opt/base/convert.py @@ -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() diff --git a/pyomo/opt/solver/shellcmd.py b/pyomo/opt/solver/shellcmd.py index aad4298729a..20892000066 100644 --- a/pyomo/opt/solver/shellcmd.py +++ b/pyomo/opt/solver/shellcmd.py @@ -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()