Merge pull request #182 from 4flixt/develop

Minor fixes
do-mpc · Sep 8, 2021 · 9404b82 · 9404b82
2 parents e454f2e + f72d7b6
commit 9404b82
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/do_mpc/controller.py b/do_mpc/controller.py
@@ -420,12 +420,12 @@ def set_param(self, **kwargs):
             ::
 
                 MPC.set_param(nlpsol_opts = {'ipopt.linear_solver': 'MA27'})
-        .. note:: To surpress the output of IPOPT, please use:
+        .. note:: To suppress the output of IPOPT, please use:
 
             ::
 
-                surpress_ipopt = {'ipopt.print_level':0, 'ipopt.sb': 'yes', 'print_time':0}
-                MPC.set_param(nlpsol_opts = surpress_ipopt)
+                suppress_ipopt = {'ipopt.print_level':0, 'ipopt.sb': 'yes', 'print_time':0}
+                MPC.set_param(nlpsol_opts = suppress_ipopt)
         """
         assert self.flags['setup'] == False, 'Setting parameters after setup is prohibited.'
 

diff --git a/do_mpc/estimator.py b/do_mpc/estimator.py
@@ -473,12 +473,12 @@ def set_param(self, **kwargs):
             ::
 
                 optimizer.set_param(nlpsol_opts = {'ipopt.linear_solver': 'MA27'})
-        .. note:: To surpress the output of IPOPT, please use:
+        .. note:: To suppress the output of IPOPT, please use:
 
             ::
 
-                surpress_ipopt = {'ipopt.print_level':0, 'ipopt.sb': 'yes', 'print_time':0}
-                optimizer.set_param(nlpsol_opts = surpress_ipopt)
+                suppress_ipopt = {'ipopt.print_level':0, 'ipopt.sb': 'yes', 'print_time':0}
+                optimizer.set_param(nlpsol_opts = suppress_ipopt)
 
         """
         assert self.flags['setup'] == False, 'Setting parameters after setup is prohibited.'

diff --git a/documentation/source/mhe_example.ipynb b/documentation/source/mhe_example.ipynb
@@ -626,7 +626,7 @@
    "outputs": [],
    "source": [
     "%%capture \n",
-    "# We just want to create the plot and not show it right now. This \"inline magic\" surpresses the output.\n",
+    "# We just want to create the plot and not show it right now. This \"inline magic\" suppresses the output.\n",
     "fig, ax = plt.subplots(3, sharex=True, figsize=(16,9))\n",
     "fig.align_ylabels()\n",
     "\n",

diff --git a/examples/CSTR/template_mpc.py b/examples/CSTR/template_mpc.py
@@ -89,11 +89,6 @@ def template_mpc(model):
     mpc.set_nl_cons('T_R', _x['T_R'], ub=140, soft_constraint=True, penalty_term_cons=1e2)
 
 
-    mpc._x0['C_a'] = 0.8
-    mpc._x0['C_b'] = 0.5
-    mpc._x0['T_R'] = 134.14
-    mpc._x0['T_K'] = 130.0
-
     alpha_var = np.array([1., 1.05, 0.95])
     beta_var = np.array([1., 1.1, 0.9])