Skip to content

Commit f540bcc

Browse files
vlkongvlkong
committed
updated with 2.20.204
1 parent f40f963 commit f540bcc

33 files changed

+12116
-969
lines changed

‎examples/cp/jupyter/SteelMill.ipynb‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,14 @@
1313
"\n",
1414
">This notebook is part of **[Prescriptive Analytics for Python](http://ibmdecisionoptimization.github.io/docplex-doc/)**\n",
1515
">\n",
16-
">It requires either an [installation of CPLEX Optimizers](http://ibmdecisionoptimization.github.io/docplex-doc/getting_started.html) or it can be run on [IBM Watson Studio Cloud](https://www.ibm.com/cloud/watson-studio/>) (Sign up for a [free IBM Cloud account](https://dataplatform.cloud.ibm.com/registration/stepone?context=wdp&apps=all>)\n",
17-
"and you can start using Watson Studio Cloud right away).\n",
16+
">It requires either an [installation of CPLEX Optimizers](http://ibmdecisionoptimization.github.io/docplex-doc/getting_started.html) or it can be run on [IBM Cloud Pak for Data as a Service](https://www.ibm.com/products/cloud-pak-for-data/as-a-service/) (Sign up for a [free IBM Cloud account](https://dataplatform.cloud.ibm.com/registration/stepone?context=wdp&apps=all>)\n",
17+
"and you can start using `IBM Cloud Pak for Data as a Service` right away).\n",
18+
">\n",
19+
"> CPLEX is available on <i>IBM Cloud Pack for Data</i> and <i>IBM Cloud Pak for Data as a Service</i>:\n",
20+
"> - <i>IBM Cloud Pak for Data as a Service</i>: Depends on the runtime used:\n",
21+
"> - <i>Python 3.x</i> runtime: Community edition\n",
22+
"> - <i>Python 3.x + DO</i> runtime: full edition\n",
23+
"> - <i>Cloud Pack for Data</i>: Community edition is installed by default. Please install `DO` addon in `Watson Studio Premium` for the full edition\n",
1824
"\n",
1925
"Table of contents:\n",
2026
"\n",
@@ -370,7 +376,7 @@
370376
"source": [
371377
"#### References\n",
372378
"* [CPLEX Modeling for Python documentation](https://rawgit.com/IBMDecisionOptimization/docplex-doc/master/docs/index.html)\n",
373-
"* [Decision Optimization on Cloud](https://developer.ibm.com/docloud/)\n",
379+
"* [IBM Decision Optimization](https://www.ibm.com/analytics/decision-optimization)\n",
374380
"* Need help with DOcplex or to report a bug? Please go [here](https://stackoverflow.com/questions/tagged/docplex)\n",
375381
"* Contact us at dofeedback@wwpdl.vnet.ibm.com"
376382
]
@@ -379,8 +385,15 @@
379385
"cell_type": "markdown",
380386
"metadata": {},
381387
"source": [
382-
"Copyright © 2017, 2018 IBM. IPLA licensed Sample Materials."
388+
"Copyright © 2017, 2021 IBM. IPLA licensed Sample Materials."
383389
]
390+
},
391+
{
392+
"cell_type": "code",
393+
"execution_count": null,
394+
"metadata": {},
395+
"outputs": [],
396+
"source": []
384397
}
385398
],
386399
"metadata": {
@@ -399,7 +412,7 @@
399412
"name": "python",
400413
"nbconvert_exporter": "python",
401414
"pygments_lexer": "ipython3",
402-
"version": "3.6.1"
415+
"version": "3.7.8"
403416
}
404417
},
405418
"nbformat": 4,

‎examples/cp/jupyter/golomb_ruler.ipynb‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,14 @@
1212
"\n",
1313
">This notebook is part of **[Prescriptive Analytics for Python](http://ibmdecisionoptimization.github.io/docplex-doc/)**\n",
1414
">\n",
15-
">It requires either an [installation of CPLEX Optimizers](http://ibmdecisionoptimization.github.io/docplex-doc/getting_started.html) or it can be run on [IBM Watson Studio Cloud](https://www.ibm.com/cloud/watson-studio/>) (Sign up for a [free IBM Cloud account](https://dataplatform.cloud.ibm.com/registration/stepone?context=wdp&apps=all>)\n",
16-
"and you can start using Watson Studio Cloud right away).\n",
15+
">It requires either an [installation of CPLEX Optimizers](http://ibmdecisionoptimization.github.io/docplex-doc/getting_started.html) or it can be run on [IBM Cloud Pak for Data as a Service](https://www.ibm.com/products/cloud-pak-for-data/as-a-service/) (Sign up for a [free IBM Cloud account](https://dataplatform.cloud.ibm.com/registration/stepone?context=wdp&apps=all>)\n",
16+
"and you can start using `IBM Cloud Pak for Data as a Service` right away).\n",
17+
">\n",
18+
"> CPLEX is available on <i>IBM Cloud Pack for Data</i> and <i>IBM Cloud Pak for Data as a Service</i>:\n",
19+
"> - <i>IBM Cloud Pak for Data as a Service</i>: Depends on the runtime used:\n",
20+
"> - <i>Python 3.x</i> runtime: Community edition\n",
21+
"> - <i>Python 3.x + DO</i> runtime: full edition\n",
22+
"> - <i>Cloud Pack for Data</i>: Community edition is installed by default. Please install `DO` addon in `Watson Studio Premium` for the full edition\n",
1723
"\n",
1824
"Table of contents:\n",
1925
"\n",
@@ -504,7 +510,7 @@
504510
"source": [
505511
"#### References\n",
506512
"* [CPLEX Modeling for Python documentation](https://rawgit.com/IBMDecisionOptimization/docplex-doc/master/docs/index.html)\n",
507-
"* [Decision Optimization on Cloud](https://developer.ibm.com/docloud/)\n",
513+
"* [IBM Decision Optimization](https://www.ibm.com/analytics/decision-optimization)\n",
508514
"* Need help with DOcplex or to report a bug? Please go [here](https://stackoverflow.com/questions/tagged/docplex)\n",
509515
"* Contact us at dofeedback@wwpdl.vnet.ibm.com"
510516
]
@@ -513,8 +519,15 @@
513519
"cell_type": "markdown",
514520
"metadata": {},
515521
"source": [
516-
"Copyright © 2017, 2018 IBM. IPLA licensed Sample Materials."
522+
"Copyright © 2017, 2021 IBM. IPLA licensed Sample Materials."
517523
]
524+
},
525+
{
526+
"cell_type": "code",
527+
"execution_count": null,
528+
"metadata": {},
529+
"outputs": [],
530+
"source": []
518531
}
519532
],
520533
"metadata": {
@@ -533,7 +546,7 @@
533546
"name": "python",
534547
"nbconvert_exporter": "python",
535548
"pygments_lexer": "ipython3",
536-
"version": "3.6.1"
549+
"version": "3.7.8"
537550
}
538551
},
539552
"nbformat": 4,

‎examples/cp/jupyter/house_building.ipynb‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,15 @@
1212
"\n",
1313
"When you finish this tutorial, you'll have a foundational knowledge of _Prescriptive Analytics_.\n",
1414
"\n",
15-
">This notebook is part of **[Prescriptive Analytics for Python](http://ibmdecisionoptimization.github.io/docplex-doc/)**\n",
15+
">It requires either an [installation of CPLEX Optimizers](http://ibmdecisionoptimization.github.io/docplex-doc/getting_started.html) or it can be run on [IBM Cloud Pak for Data as a Service](https://www.ibm.com/products/cloud-pak-for-data/as-a-service/) (Sign up for a [free IBM Cloud account](https://dataplatform.cloud.ibm.com/registration/stepone?context=wdp&apps=all>)\n",
16+
"and you can start using `IBM Cloud Pak for Data as a Service` right away).\n",
1617
">\n",
17-
">It requires either an [installation of CPLEX Optimizers](http://ibmdecisionoptimization.github.io/docplex-doc/getting_started.html) or it can be run on [IBM Watson Studio Cloud](https://www.ibm.com/cloud/watson-studio/>) (Sign up for a [free IBM Cloud account](https://dataplatform.cloud.ibm.com/registration/stepone?context=wdp&apps=all>)\n",
18-
"and you can start using Watson Studio Cloud right away).\n",
18+
"> CPLEX is available on <i>IBM Cloud Pack for Data</i> and <i>IBM Cloud Pak for Data as a Service</i>:\n",
19+
"> - <i>IBM Cloud Pak for Data as a Service</i>: Depends on the runtime used:\n",
20+
"> - <i>Python 3.x</i> runtime: Community edition\n",
21+
"> - <i>Python 3.x + DO</i> runtime: full edition\n",
22+
"> - <i>Cloud Pack for Data</i>: Community edition is installed by default. Please install `DO` addon in `Watson Studio Premium` for the full edition\n",
23+
"\n",
1924
"\n",
2025
"\n",
2126
"\n",
@@ -977,7 +982,7 @@
977982
"source": [
978983
"#### References\n",
979984
"* [CPLEX Modeling for Python documentation](https://rawgit.com/IBMDecisionOptimization/docplex-doc/master/docs/index.html)\n",
980-
"* [Decision Optimization on Cloud](https://developer.ibm.com/docloud/)\n",
985+
"* [IBM Decision Optimization](https://www.ibm.com/analytics/decision-optimization)\n",
981986
"* Need help with DOcplex or to report a bug? Please go [here](https://stackoverflow.com/questions/tagged/docplex)\n",
982987
"* Contact us at dofeedback@wwpdl.vnet.ibm.com"
983988
]
@@ -986,8 +991,15 @@
986991
"cell_type": "markdown",
987992
"metadata": {},
988993
"source": [
989-
"Copyright © 2017, 2018 IBM. IPLA licensed Sample Materials."
994+
"Copyright © 2017, 2021 IBM. IPLA licensed Sample Materials."
990995
]
996+
},
997+
{
998+
"cell_type": "code",
999+
"execution_count": null,
1000+
"metadata": {},
1001+
"outputs": [],
1002+
"source": []
9911003
}
9921004
],
9931005
"metadata": {
@@ -1006,7 +1018,7 @@
10061018
"name": "python",
10071019
"nbconvert_exporter": "python",
10081020
"pygments_lexer": "ipython3",
1009-
"version": "3.6.1"
1021+
"version": "3.7.8"
10101022
}
10111023
},
10121024
"nbformat": 4,

‎examples/cp/jupyter/n_queen.ipynb‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,15 @@
1313
"\n",
1414
">This notebook is part of **[Prescriptive Analytics for Python](http://ibmdecisionoptimization.github.io/docplex-doc/)**\n",
1515
">\n",
16-
">It requires either an [installation of CPLEX Optimizers](http://ibmdecisionoptimization.github.io/docplex-doc/getting_started.html) or it can be run on [IBM Watson Studio Cloud](https://www.ibm.com/cloud/watson-studio/>) (Sign up for a [free IBM Cloud account](https://dataplatform.cloud.ibm.com/registration/stepone?context=wdp&apps=all>)\n",
17-
"and you can start using Watson Studio Cloud right away).\n",
16+
">It requires either an [installation of CPLEX Optimizers](http://ibmdecisionoptimization.github.io/docplex-doc/getting_started.html) or it can be run on [IBM Cloud Pak for Data as a Service](https://www.ibm.com/products/cloud-pak-for-data/as-a-service/) (Sign up for a [free IBM Cloud account](https://dataplatform.cloud.ibm.com/registration/stepone?context=wdp&apps=all>)\n",
17+
"and you can start using `IBM Cloud Pak for Data as a Service` right away).\n",
18+
">\n",
19+
"> CPLEX is available on <i>IBM Cloud Pack for Data</i> and <i>IBM Cloud Pak for Data as a Service</i>:\n",
20+
"> - <i>IBM Cloud Pak for Data as a Service</i>: Depends on the runtime used:\n",
21+
"> - <i>Python 3.x</i> runtime: Community edition\n",
22+
"> - <i>Python 3.x + DO</i> runtime: full edition\n",
23+
"> - <i>Cloud Pack for Data</i>: Community edition is installed by default. Please install `DO` addon in `Watson Studio Premium` for the full edition\n",
24+
"\n",
1825
"\n",
1926
"\n",
2027
"Table of contents:\n",
@@ -346,7 +353,7 @@
346353
"source": [
347354
"#### References\n",
348355
"* [CPLEX Modeling for Python documentation](https://rawgit.com/IBMDecisionOptimization/docplex-doc/master/docs/index.html)\n",
349-
"* [Decision Optimization on Cloud](https://developer.ibm.com/docloud/)\n",
356+
"* [IBM Decision Optimization](https://www.ibm.com/analytics/decision-optimization)\n",
350357
"* Need help with DOcplex or to report a bug? Please go [here](https://stackoverflow.com/questions/tagged/docplex)\n",
351358
"* Contact us at dofeedback@wwpdl.vnet.ibm.com"
352359
]
@@ -355,7 +362,7 @@
355362
"cell_type": "markdown",
356363
"metadata": {},
357364
"source": [
358-
"Copyright © 2017, 2018 IBM. IPLA licensed Sample Materials."
365+
"Copyright © 2017, 2021 IBM. IPLA licensed Sample Materials."
359366
]
360367
},
361368
{
@@ -382,7 +389,7 @@
382389
"name": "python",
383390
"nbconvert_exporter": "python",
384391
"pygments_lexer": "ipython3",
385-
"version": "3.6.1"
392+
"version": "3.7.8"
386393
}
387394
},
388395
"nbformat": 4,

‎examples/cp/jupyter/sched_square.ipynb‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,14 @@
1313
"\n",
1414
">This notebook is part of **[Prescriptive Analytics for Python](http://ibmdecisionoptimization.github.io/docplex-doc/)**\n",
1515
">\n",
16-
">It requires either an [installation of CPLEX Optimizers](http://ibmdecisionoptimization.github.io/docplex-doc/getting_started.html) or it can be run on [IBM Watson Studio Cloud](https://www.ibm.com/cloud/watson-studio/>) (Sign up for a [free IBM Cloud account](https://dataplatform.cloud.ibm.com/registration/stepone?context=wdp&apps=all>)\n",
17-
"and you can start using Watson Studio Cloud right away).\n",
16+
">It requires either an [installation of CPLEX Optimizers](http://ibmdecisionoptimization.github.io/docplex-doc/getting_started.html) or it can be run on [IBM Cloud Pak for Data as a Service](https://www.ibm.com/products/cloud-pak-for-data/as-a-service/) (Sign up for a [free IBM Cloud account](https://dataplatform.cloud.ibm.com/registration/stepone?context=wdp&apps=all>)\n",
17+
"and you can start using `IBM Cloud Pak for Data as a Service` right away).\n",
18+
">\n",
19+
"> CPLEX is available on <i>IBM Cloud Pack for Data</i> and <i>IBM Cloud Pak for Data as a Service</i>:\n",
20+
"> - <i>IBM Cloud Pak for Data as a Service</i>: Depends on the runtime used:\n",
21+
"> - <i>Python 3.x</i> runtime: Community edition\n",
22+
"> - <i>Python 3.x + DO</i> runtime: full edition\n",
23+
"> - <i>Cloud Pack for Data</i>: Community edition is installed by default. Please install `DO` addon in `Watson Studio Premium` for the full edition\n",
1824
"\n",
1925
"Table of contents:\n",
2026
"\n",
@@ -392,7 +398,7 @@
392398
"source": [
393399
"#### References\n",
394400
"* [CPLEX Modeling for Python documentation](https://rawgit.com/IBMDecisionOptimization/docplex-doc/master/docs/index.html)\n",
395-
"* [Decision Optimization on Cloud](https://developer.ibm.com/docloud/)\n",
401+
"* [IBM Decision Optimization](https://www.ibm.com/analytics/decision-optimization)\n",
396402
"* Need help with DOcplex or to report a bug? Please go [here](https://stackoverflow.com/questions/tagged/docplex)\n",
397403
"* Contact us at dofeedback@wwpdl.vnet.ibm.com"
398404
]
@@ -401,7 +407,7 @@
401407
"cell_type": "markdown",
402408
"metadata": {},
403409
"source": [
404-
"Copyright © 2017, 2018 IBM. IPLA licensed Sample Materials."
410+
"Copyright © 2017, 2021 IBM. IPLA licensed Sample Materials."
405411
]
406412
},
407413
{
@@ -429,7 +435,7 @@
429435
"name": "python",
430436
"nbconvert_exporter": "python",
431437
"pygments_lexer": "ipython3",
432-
"version": "3.6.1"
438+
"version": "3.7.8"
433439
}
434440
},
435441
"nbformat": 4,

‎examples/cp/jupyter/scheduling_tuto.ipynb‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,14 @@
1515
"\n",
1616
">This notebook is part of **[Prescriptive Analytics for Python](http://ibmdecisionoptimization.github.io/docplex-doc/)**\n",
1717
">\n",
18-
">It requires either an [installation of CPLEX Optimizers](http://ibmdecisionoptimization.github.io/docplex-doc/getting_started.html) or it can be run on [IBM Watson Studio Cloud](https://www.ibm.com/cloud/watson-studio/>) (Sign up for a [free IBM Cloud account](https://dataplatform.cloud.ibm.com/registration/stepone?context=wdp&apps=all>)\n",
19-
"and you can start using Watson Studio Cloud right away).\n",
18+
">It requires either an [installation of CPLEX Optimizers](http://ibmdecisionoptimization.github.io/docplex-doc/getting_started.html) or it can be run on [IBM Cloud Pak for Data as a Service](https://www.ibm.com/products/cloud-pak-for-data/as-a-service/) (Sign up for a [free IBM Cloud account](https://dataplatform.cloud.ibm.com/registration/stepone?context=wdp&apps=all>)\n",
19+
"and you can start using `IBM Cloud Pak for Data as a Service` right away).\n",
20+
">\n",
21+
"> CPLEX is available on <i>IBM Cloud Pack for Data</i> and <i>IBM Cloud Pak for Data as a Service</i>:\n",
22+
"> - <i>IBM Cloud Pak for Data as a Service</i>: Depends on the runtime used:\n",
23+
"> - <i>Python 3.x</i> runtime: Community edition\n",
24+
"> - <i>Python 3.x + DO</i> runtime: full edition\n",
25+
"> - <i>Cloud Pack for Data</i>: Community edition is installed by default. Please install `DO` addon in `Watson Studio Premium` for the full edition\n",
2026
"\n",
2127
"To follow the examples in this section, some knowledge about optimization (math programming or constraint programming) and about modeling optimization problems is necessary.\n",
2228
"For beginners in optimization, following the online free Decision Optimization tutorials ([here](https://ibmdecisionoptimization.github.io/tutorials/html/Linear_Programming.html) and [here](https://ibmdecisionoptimization.github.io/tutorials/html/Beyond_Linear_Programming.html)) might help to get a better understanding of Mathematical Optimization.\n",
@@ -3320,7 +3326,7 @@
33203326
"source": [
33213327
"## References\n",
33223328
"* [CPLEX Modeling for Python documentation](https://rawgit.com/IBMDecisionOptimization/docplex-doc/master/docs/index.html)\n",
3323-
"* [Decision Optimization on Cloud](https://developer.ibm.com/docloud/)\n",
3329+
"* [IBM Decision Optimization](https://www.ibm.com/analytics/decision-optimization)\n",
33243330
"* Need help with DOcplex or to report a bug? Please go [here](https://stackoverflow.com/questions/tagged/docplex).\n",
33253331
"* Contact us at dofeedback@wwpdl.vnet.ibm.com."
33263332
]
@@ -3329,28 +3335,35 @@
33293335
"cell_type": "markdown",
33303336
"metadata": {},
33313337
"source": [
3332-
"Copyright © 2017, 2018 IBM. IPLA licensed Sample Materials."
3338+
"Copyright © 2017, 2021 IBM. IPLA licensed Sample Materials."
33333339
]
3340+
},
3341+
{
3342+
"cell_type": "code",
3343+
"execution_count": null,
3344+
"metadata": {},
3345+
"outputs": [],
3346+
"source": []
33343347
}
33353348
],
33363349
"metadata": {
33373350
"anaconda-cloud": {},
33383351
"kernelspec": {
3339-
"display_name": "Python 2",
3352+
"display_name": "Python 3",
33403353
"language": "python",
3341-
"name": "python2"
3354+
"name": "python3"
33423355
},
33433356
"language_info": {
33443357
"codemirror_mode": {
33453358
"name": "ipython",
3346-
"version": 2
3359+
"version": 3
33473360
},
33483361
"file_extension": ".py",
33493362
"mimetype": "text/x-python",
33503363
"name": "python",
33513364
"nbconvert_exporter": "python",
3352-
"pygments_lexer": "ipython2",
3353-
"version": "2.7.15"
3365+
"pygments_lexer": "ipython3",
3366+
"version": "3.7.8"
33543367
}
33553368
},
33563369
"nbformat": 4,

‎examples/cp/jupyter/sports_scheduling.ipynb‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,14 @@
1515
"\n",
1616
">This notebook is part of **[Prescriptive Analytics for Python](http://ibmdecisionoptimization.github.io/docplex-doc/)**\n",
1717
">\n",
18-
">It requires either an [installation of CPLEX Optimizers](http://ibmdecisionoptimization.github.io/docplex-doc/getting_started.html) or it can be run on [IBM Watson Studio Cloud](https://www.ibm.com/cloud/watson-studio/>) (Sign up for a [free IBM Cloud account](https://dataplatform.cloud.ibm.com/registration/stepone?context=wdp&apps=all>)\n",
19-
"and you can start using Watson Studio Cloud right away). \n",
18+
">It requires either an [installation of CPLEX Optimizers](http://ibmdecisionoptimization.github.io/docplex-doc/getting_started.html) or it can be run on [IBM Cloud Pak for Data as a Service](https://www.ibm.com/products/cloud-pak-for-data/as-a-service/) (Sign up for a [free IBM Cloud account](https://dataplatform.cloud.ibm.com/registration/stepone?context=wdp&apps=all>)\n",
19+
"and you can start using `IBM Cloud Pak for Data as a Service` right away).\n",
20+
">\n",
21+
"> CPLEX is available on <i>IBM Cloud Pack for Data</i> and <i>IBM Cloud Pak for Data as a Service</i>:\n",
22+
"> - <i>IBM Cloud Pak for Data as a Service</i>: Depends on the runtime used:\n",
23+
"> - <i>Python 3.x</i> runtime: Community edition\n",
24+
"> - <i>Python 3.x + DO</i> runtime: full edition\n",
25+
"> - <i>Cloud Pack for Data</i>: Community edition is installed by default. Please install `DO` addon in `Watson Studio Premium` for the full edition\n",
2026
"\n",
2127
"Table of contents:\n",
2228
"\n",
@@ -590,7 +596,7 @@
590596
"source": [
591597
"#### References\n",
592598
"* [Decision Optimization CPLEX Modeling for Python documentation](https://rawgit.com/IBMDecisionOptimization/docplex-doc/master/docs/index.html)\n",
593-
"* [Decision Optimization on Cloud](https://developer.ibm.com/docloud/)\n",
599+
"* [IBM Decision Optimization](https://www.ibm.com/analytics/decision-optimization)\n",
594600
"* Need help with DOcplex or to report a bug? Please go [here](https://stackoverflow.com/questions/tagged/docplex)\n",
595601
"* Contact us at dofeedback@wwpdl.vnet.ibm.com\"\n"
596602
]
@@ -620,7 +626,7 @@
620626
"name": "python",
621627
"nbconvert_exporter": "python",
622628
"pygments_lexer": "ipython3",
623-
"version": "3.6.1"
629+
"version": "3.7.8"
624630
}
625631
},
626632
"nbformat": 4,

0 commit comments

Comments
 (0)