Skip to content

Commit 35fb2b0

Browse files
authored
Merge pull request #6 from IBMDecisionOptimization/release_2.21.207
updating master with docplex 2.21 doc
2 parents 372d7a5 + c782b04 commit 35fb2b0

198 files changed

Lines changed: 7766 additions & 5161 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/CHANGELOG.html

Lines changed: 54 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<head>
77
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
88
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
9-
<title>Changelog &#8212; IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.20 documentation</title>
9+
<title>Changelog &#8212; IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.21 documentation</title>
1010
<link rel="stylesheet" href="_static/bizstyle.css" type="text/css" />
1111
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1212

@@ -29,15 +29,16 @@ <h3>Navigation</h3>
2929
<li class="right" style="margin-right: 10px">
3030
<a href="genindex.html" title="General Index"
3131
accesskey="I">index</a></li>
32-
<li class="nav-item nav-item-0"><a href="index.html">IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.20 documentation</a> &#187;</li>
32+
<li class="nav-item nav-item-0"><a href="index.html">IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.21 documentation</a> &#187;</li>
3333
</ul>
3434
</div>
3535
<div class="sphinxsidebar" role="navigation" aria-label="main navigation">
3636
<div class="sphinxsidebarwrapper">
3737
<h3><a href="index.html">Table of Contents</a></h3>
3838
<ul>
3939
<li><a class="reference internal" href="#">Changelog</a><ul>
40-
<li><a class="reference internal" href="#changed-in-2-20-204">Changed in 2.20.204:</a></li>
40+
<li><a class="reference internal" href="#changed-in-2-21-207">Changed in 2.21.207:</a></li>
41+
<li><a class="reference internal" href="#changed-in-2-20-204-2021-02">Changed in 2.20.204 (2021.02):</a></li>
4142
<li><a class="reference internal" href="#changed-in-2-19-202-2020-12">Changed in 2.19.202 (2020.12):</a></li>
4243
<li><a class="reference internal" href="#changed-in-2-18-200-2020-11-3">Changed in 2.18.200 (2020.11.#3):</a></li>
4344
<li><a class="reference internal" href="#changed-in-2-17-196-2020-11-2">Changed in 2.17.196 (2020.11.#2):</a></li>
@@ -75,8 +76,50 @@ <h3><a href="index.html">Table of Contents</a></h3>
7576

7677
<div class="section" id="changelog">
7778
<h1>Changelog<a class="headerlink" href="#changelog" title="Permalink to this headline">&para;</a></h1>
78-
<div class="section" id="changed-in-2-20-204">
79-
<h2>Changed in 2.20.204:<a class="headerlink" href="#changed-in-2-20-204" title="Permalink to this headline">&para;</a></h2>
79+
<div class="section" id="changed-in-2-21-207">
80+
<h2>Changed in 2.21.207:<a class="headerlink" href="#changed-in-2-21-207" title="Permalink to this headline">&para;</a></h2>
81+
<ul class="simple">
82+
<li><dl class="first docutils">
83+
<dt>In <code class="docutils literal notranslate"><span class="pre">docplex.mp</span></code>:</dt>
84+
<dd><ul class="first last">
85+
<li><dl class="first docutils">
86+
<dt>Add support for importing solution from a different model, provided variables</dt>
87+
<dd>can be matched between both models (Model.import_solution)</dd>
88+
</dl>
89+
</li>
90+
<li><dl class="first docutils">
91+
<dt>Added contextual function to temporarily modify aspects of the model:</dt>
92+
<dd><cite>model_parameters</cite> to change parameters in a block, <cite>model_objective</cite> to set a temporary objective in a block.</dd>
93+
</dl>
94+
</li>
95+
<li>Naming expressions is now deprecated, use a temporary variable if needed.</li>
96+
<li><dl class="first docutils">
97+
<dt>Display of expressions in constraints is customizable: use a space separator (or not),</dt>
98+
<dd>set a maximum length for very long expression.</dd>
99+
</dl>
100+
</li>
101+
<li>Fixed documentation references to class Var, moved from linear to dvar</li>
102+
<li>Fixed a bug in LP export for multi-objective models with no priorities passed</li>
103+
</ul>
104+
</dd>
105+
</dl>
106+
</li>
107+
<li><dl class="first docutils">
108+
<dt>In <code class="docutils literal notranslate"><span class="pre">docplex.cp</span></code>:</dt>
109+
<dd><ul class="first last">
110+
<li>Replace context attribute solve_with_start_next by solve_with_search_next, keeping ascending compatibility.</li>
111+
<li>Support solver parameter ModelAnonymizer to generate random names for all model elements (except KPIs) in the CPO file format.</li>
112+
<li>Optimize generation of CPO expressions from Python expressions</li>
113+
<li>Interval variable solutions tuples are now named tuples.</li>
114+
<li>Method CpoModel.add() now accepts multiple expressions (or lists of expressions) to add to the model.</li>
115+
</ul>
116+
</dd>
117+
</dl>
118+
</li>
119+
</ul>
120+
</div>
121+
<div class="section" id="changed-in-2-20-204-2021-02">
122+
<h2>Changed in 2.20.204 (2021.02):<a class="headerlink" href="#changed-in-2-20-204-2021-02" title="Permalink to this headline">&para;</a></h2>
80123
<ul class="simple">
81124
<li><dl class="first docutils">
82125
<dt>In <code class="docutils literal notranslate"><span class="pre">docplex.mp</span></code>:</dt>
@@ -96,7 +139,7 @@ <h2>Changed in 2.20.204:<a class="headerlink" href="#changed-in-2-20-204" title=
96139
</dl>
97140
</li>
98141
<li>Fixed a bug about not printing updated variable bounds in MPS and SAV</li>
99-
<li>Changed the default rounding behavior: solurtion values are not rounded by default.</li>
142+
<li>Changed the default rounding behavior: solution values are not rounded by default.</li>
100143
</ul>
101144
</dd>
102145
</dl>
@@ -108,6 +151,10 @@ <h2>Changed in 2.20.204:<a class="headerlink" href="#changed-in-2-20-204" title=
108151
<li>Add status in conflict refiner solution object.</li>
109152
<li>Fix a bug to not send and receive conflict in CPO format if no conflict.</li>
110153
<li>Enhance printing of model solution.</li>
154+
<li>The method search_next(), returns only new solutions of the model.
155+
In particular, no new solution is returned if solve status just change from Feasible to Optimal.</li>
156+
<li>Rework completely model statistics (CpoModelStatistics)</li>
157+
<li>Add a parameter add_cpo to the write method of CpoRefineConflictResult</li>
111158
</ul>
112159
</dd>
113160
</dl>
@@ -744,7 +791,7 @@ <h3>Navigation</h3>
744791
<li class="right" style="margin-right: 10px">
745792
<a href="genindex.html" title="General Index"
746793
>index</a></li>
747-
<li class="nav-item nav-item-0"><a href="index.html">IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.20 documentation</a> &#187;</li>
794+
<li class="nav-item nav-item-0"><a href="index.html">IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.21 documentation</a> &#187;</li>
748795
</ul>
749796
</div>
750797
<div class="footer" role="contentinfo">

docs/README.md.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<head>
77
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
88
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
9-
<title>README.md &#8212; IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.20 documentation</title>
9+
<title>README.md &#8212; IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.21 documentation</title>
1010
<link rel="stylesheet" href="_static/bizstyle.css" type="text/css" />
1111
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1212

@@ -29,7 +29,7 @@ <h3>Navigation</h3>
2929
<li class="right" style="margin-right: 10px">
3030
<a href="genindex.html" title="General Index"
3131
accesskey="I">index</a></li>
32-
<li class="nav-item nav-item-0"><a href="index.html">IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.20 documentation</a> &#187;</li>
32+
<li class="nav-item nav-item-0"><a href="index.html">IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.21 documentation</a> &#187;</li>
3333
</ul>
3434
</div>
3535
<div class="sphinxsidebar" role="navigation" aria-label="main navigation">
@@ -167,7 +167,7 @@ <h3>Navigation</h3>
167167
<li class="right" style="margin-right: 10px">
168168
<a href="genindex.html" title="General Index"
169169
>index</a></li>
170-
<li class="nav-item nav-item-0"><a href="index.html">IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.20 documentation</a> &#187;</li>
170+
<li class="nav-item nav-item-0"><a href="index.html">IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.21 documentation</a> &#187;</li>
171171
</ul>
172172
</div>
173173
<div class="footer" role="contentinfo">

docs/_static/bizstyle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ $(window).resize(function(){
3636
$("li.nav-item-0 a").text("Top");
3737
}
3838
else {
39-
$("li.nav-item-0 a").text("IBM® Decision Optimization CPLEX® Modeling for Python (DOcplex) V2.20 documentation");
39+
$("li.nav-item-0 a").text("IBM® Decision Optimization CPLEX® Modeling for Python (DOcplex) V2.21 documentation");
4040
}
4141
});

docs/_static/documentation_options.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var DOCUMENTATION_OPTIONS = {
22
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
3-
VERSION: 'V2.20',
3+
VERSION: 'V2.21',
44
LANGUAGE: 'None',
55
COLLAPSE_INDEX: false,
66
FILE_SUFFIX: '.html',

docs/cp.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<head>
77
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
88
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
9-
<title>Overview of constraint programming &#8212; IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.20 documentation</title>
9+
<title>Overview of constraint programming &#8212; IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.21 documentation</title>
1010
<link rel="stylesheet" href="_static/bizstyle.css" type="text/css" />
1111
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1212

@@ -29,7 +29,7 @@ <h3>Navigation</h3>
2929
<li class="right" style="margin-right: 10px">
3030
<a href="genindex.html" title="General Index"
3131
accesskey="I">index</a></li>
32-
<li class="nav-item nav-item-0"><a href="index.html">IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.20 documentation</a> &#187;</li>
32+
<li class="nav-item nav-item-0"><a href="index.html">IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.21 documentation</a> &#187;</li>
3333
</ul>
3434
</div>
3535
<div class="sphinxsidebar" role="navigation" aria-label="main navigation">
@@ -237,7 +237,7 @@ <h3>Navigation</h3>
237237
<li class="right" style="margin-right: 10px">
238238
<a href="genindex.html" title="General Index"
239239
>index</a></li>
240-
<li class="nav-item nav-item-0"><a href="index.html">IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.20 documentation</a> &#187;</li>
240+
<li class="nav-item nav-item-0"><a href="index.html">IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.21 documentation</a> &#187;</li>
241241
</ul>
242242
</div>
243243
<div class="footer" role="contentinfo">
-400 Bytes
Binary file not shown.
-288 Bytes
Binary file not shown.
-236 Bytes
Binary file not shown.
-252 Bytes
Binary file not shown.
-46 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)