Skip to content

Commit 5b57d36

Browse files
author
Andrew
committed
Updates for Mk 28.3
1 parent e03050e commit 5b57d36

File tree

6 files changed

+19
-26
lines changed

6 files changed

+19
-26
lines changed

curve_and_surface_fitting/dim2_spline_ts_sctr.ipynb

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

local_optimization/DFO/DFO_noisy.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1530,7 +1530,7 @@
15301530
],
15311531
"metadata": {
15321532
"kernelspec": {
1533-
"display_name": "Python 3",
1533+
"display_name": "Python 3 (ipykernel)",
15341534
"language": "python",
15351535
"name": "python3"
15361536
},
@@ -1544,7 +1544,7 @@
15441544
"name": "python",
15451545
"nbconvert_exporter": "python",
15461546
"pygments_lexer": "ipython3",
1547-
"version": "3.8.5"
1547+
"version": "3.8.10"
15481548
},
15491549
"latex_envs": {
15501550
"LaTeX_envs_menu_present": true,

local_optimization/FOAS/rosenbrock2d.ipynb

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

local_optimization/Modelling/LP_demo.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@
264264
],
265265
"metadata": {
266266
"kernelspec": {
267-
"display_name": "Python 3",
267+
"display_name": "Python 3 (ipykernel)",
268268
"language": "python",
269269
"name": "python3"
270270
},
@@ -278,7 +278,7 @@
278278
"name": "python",
279279
"nbconvert_exporter": "python",
280280
"pygments_lexer": "ipython3",
281-
"version": "3.8.5"
281+
"version": "3.8.10"
282282
},
283283
"latex_envs": {
284284
"LaTeX_envs_menu_present": true,

local_optimization/Modelling/handle_disable_ex.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@
350350
"name": "python",
351351
"nbconvert_exporter": "python",
352352
"pygments_lexer": "ipython3",
353-
"version": "3.9.7"
353+
"version": "3.8.10"
354354
},
355355
"latex_envs": {
356356
"LaTeX_envs_menu_present": true,

local_optimization/Modelling/production_planning.ipynb

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,25 @@
3232
"- a unit of $A_1$ uses 6 square metres of packing material while a unit of $A_2$ uses 10 square metres; 6000 square metres of packing materials are available each day;\n",
3333
"- production of $A_2$ is limited to 100 units per day.\n",
3434
"\n",
35-
"Note that since the chemicals are considered fluid, the quantities $x_1$ and $x_2$ are not limited to integer values.\\\\\n",
35+
"Note that since the chemicals are considered fluid, the quantities $x_1$ and $x_2$ are not limited to integer values.\n",
3636
"\n",
3737
"The problem can be formulated as a linear program:\n",
38-
"\\vspace{0.1cn}\n",
38+
"\n",
3939
"\\begin{equation*}\n",
4040
"\\begin{array}{lll}\n",
4141
"\\underset{x\\in\\Re^n}{\\mbox{maximize}} & 2x_1+4.5x_2&\\\\[0.6ex]\n",
4242
"\\mbox{subject to} & 1.2x_1 + 3x_2 \\leq 1500, &\\text{ (machine time constraint)} \\\\[0.6ex]\n",
4343
" & 6x_1+10x_2 \\leq 6000, & \\text{ (packaging material constraint)} \\\\[0.6ex]\n",
4444
" & 40x_1+80x_2 \\leq 16000, & \\text{ (transport constraint)} \\\\[0.6ex]\n",
4545
" & 0 \\leq x_1, & \\text{ (capacity constraint)} \\\\[0.6ex]\n",
46-
" & 0 \\leq x_1 \\leq 100 & \\text{ (capacity constraint)} \\\\[0.6ex]\n",
46+
" & 0 \\leq x_2 \\leq 100 & \\text{ (capacity constraint)} \\\\[0.6ex]\n",
4747
"\\end{array}\n",
4848
"\\end{equation*}"
4949
]
5050
},
5151
{
5252
"cell_type": "code",
53-
"execution_count": 15,
53+
"execution_count": 1,
5454
"metadata": {},
5555
"outputs": [
5656
{
@@ -131,7 +131,7 @@
131131
"- production of $A_3$ is limited to 50 units per day.\n",
132132
"\n",
133133
"The problem becomes:\n",
134-
"\\vspace{0.1cn}\n",
134+
"\n",
135135
"\\begin{equation*}\n",
136136
"\\begin{array}{lll}\n",
137137
"\\underset{x\\in\\Re^n}{\\mbox{maximize}} & 2x_1+4.5x_2+7x_3&\\\\[0.6ex]\n",
@@ -147,7 +147,7 @@
147147
},
148148
{
149149
"cell_type": "code",
150-
"execution_count": 16,
150+
"execution_count": 2,
151151
"metadata": {},
152152
"outputs": [
153153
{
@@ -205,7 +205,7 @@
205205
},
206206
{
207207
"cell_type": "code",
208-
"execution_count": 17,
208+
"execution_count": 3,
209209
"metadata": {},
210210
"outputs": [
211211
{
@@ -249,24 +249,17 @@
249249
},
250250
{
251251
"cell_type": "code",
252-
"execution_count": 18,
252+
"execution_count": 4,
253253
"metadata": {},
254254
"outputs": [],
255255
"source": [
256256
"opt.handle_free(handle)"
257257
]
258-
},
259-
{
260-
"cell_type": "code",
261-
"execution_count": null,
262-
"metadata": {},
263-
"outputs": [],
264-
"source": []
265258
}
266259
],
267260
"metadata": {
268261
"kernelspec": {
269-
"display_name": "Python 3",
262+
"display_name": "Python 3 (ipykernel)",
270263
"language": "python",
271264
"name": "python3"
272265
},
@@ -280,7 +273,7 @@
280273
"name": "python",
281274
"nbconvert_exporter": "python",
282275
"pygments_lexer": "ipython3",
283-
"version": "3.8.5"
276+
"version": "3.8.10"
284277
},
285278
"latex_envs": {
286279
"LaTeX_envs_menu_present": true,

0 commit comments

Comments
 (0)