Merge branch 'main' into fix-docs-and-logging

examples/mpec/munson1.yml

@@ -24,7 +24,7 @@ runtime:
   logfile: null                  # Redirect output to the specified file.
   catch errors: true            # Trigger failures for exceptions to print
                                  #   the program stack.
-  disable gc: false              # Disable the garbage collecter.
+  disable gc: false              # Disable the garbage collector.
   interactive: false             # After executing Pyomo, launch an
                                  #   interactive Python shell. If IPython is
                                  #   installed, this shell is an IPython

pyomo/contrib/pynumero/sparse/block_vector.py

@@ -798,7 +798,7 @@ def ravel(self, order='C'):
 
     def argmax(self, axis=None, out=None):
         """
-        Returns the index of the larges element.
+        Returns the index of the largest element.
         """
         assert_block_structure(self)
         return self.flatten().argmax(axis=axis, out=out)

pyomo/core/tests/examples/test7.txt

@@ -51,7 +51,7 @@ Options:
   --model-options=MODEL_OPTIONS
                         Options passed into a create_model() function to
                         construct the model
-  --disable-gc          Disable the garbage collecter
+  --disable-gc          Disable the garbage collector
   --solver-manager=SMANAGER_TYPE
                         Specify the technique that is used to manage solver
                         executions.

pyomo/core/tests/unit/test_numeric_expr.py

@@ -3367,7 +3367,7 @@ def test_simple_product(self):
         self.assertEqual(expr.polynomial_degree(), 1)
         #
         # A fraction with a variable in the denominator has degree None.
-        # This indicates that it is not a polyomial.
+        # This indicates that it is not a polynomial.
         #
         expr = self.model.c / self.model.a
         self.assertEqual(expr.polynomial_degree(), None)

pyomo/scripting/solve_config.py

@@ -195,7 +195,7 @@ def minlp_config_block(init=False):
         ),
     ).declare_as_argument('-c', '--catch-errors', dest="catch")
     runtime.declare(
-        'disable gc', ConfigValue(False, bool, 'Disable the garbage collecter.', None)
+        'disable gc', ConfigValue(False, bool, 'Disable the garbage collector.', None)
     ).declare_as_argument('--disable-gc', dest='disable_gc')
     runtime.declare(
         'interactive',

pyomo/solvers/plugins/solvers/CPLEX.py

@@ -42,7 +42,7 @@
 
 
 def _validate_file_name(cplex, filename, description):
-    """Validate filenames against the set of allowable chaacters in CPLEX.
+    """Validate filenames against the set of allowable characters in CPLEX.
 
     Returns the filename, possibly enclosed in double-quotes, or raises
     a ValueError is unallowable characters are found.