Skip to content

Commit 160e4c7

Browse files
vlkongvlkong
authored
Merge pull request #9 from IBMDecisionOptimization/release_2.22.213b
updated to 2.22
2 parents 35fb2b0 + 39c2f4f commit 160e4c7

198 files changed

Lines changed: 8858 additions & 9516 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: 43 additions & 6 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.21 documentation</title>
9+
<title>Changelog &#8212; IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.22 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.21 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.22 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-21-207">Changed in 2.21.207:</a></li>
40+
<li><a class="reference internal" href="#changed-in-2-22-213">Changed in 2.22.213:</a></li>
41+
<li><a class="reference internal" href="#changed-in-2-21-207-2021-06">Changed in 2.21.207 (2021.06):</a></li>
4142
<li><a class="reference internal" href="#changed-in-2-20-204-2021-02">Changed in 2.20.204 (2021.02):</a></li>
4243
<li><a class="reference internal" href="#changed-in-2-19-202-2020-12">Changed in 2.19.202 (2020.12):</a></li>
4344
<li><a class="reference internal" href="#changed-in-2-18-200-2020-11-3">Changed in 2.18.200 (2020.11.#3):</a></li>
@@ -76,8 +77,44 @@ <h3><a href="index.html">Table of Contents</a></h3>
7677

7778
<div class="section" id="changelog">
7879
<h1>Changelog<a class="headerlink" href="#changelog" title="Permalink to this headline">&para;</a></h1>
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>
80+
<div class="section" id="changed-in-2-22-213">
81+
<h2>Changed in 2.22.213:<a class="headerlink" href="#changed-in-2-22-213" title="Permalink to this headline">&para;</a></h2>
82+
<ul class="simple">
83+
<li>Removed zeppelin examples</li>
84+
<li><dl class="first docutils">
85+
<dt>In <code class="docutils literal notranslate"><span class="pre">docplex.mp</span></code>:</dt>
86+
<dd><ul class="first last">
87+
<li>Added a variant of Model.sum() with variable number of arguments: Model.sums()</li>
88+
<li>Removed all Python2 compatibility code</li>
89+
<li>Added deterministic time in solve details.</li>
90+
<li>Linear relaxer now relaxes SOS variable sets (linear sum relaxation)</li>
91+
<li>Fixed a bug on Model.solve_with_goals() with quadratic sub-objectives</li>
92+
<li>Fixed a bug in SolveSolution.kpi_value_by_name</li>
93+
<li>Fixed a bug in SolveSolution.get_value_dict() about precision filtering</li>
94+
<li>Fixed a bug when updating a constraint rhs with a NaN value now raises exception.</li>
95+
</ul>
96+
</dd>
97+
</dl>
98+
</li>
99+
<li><dl class="first docutils">
100+
<dt>In <code class="docutils literal notranslate"><span class="pre">docplex.cp</span></code>:</dt>
101+
<dd><ul class="first last">
102+
<li><dl class="first docutils">
103+
<dt>Add new methods get_objective_value(), get_objective_bound() and get_objective_gap() on CpoModelSolution</dt>
104+
<dd>and CpoSolveResult to access directly the first objective, bound or gap.</dd>
105+
</dl>
106+
</li>
107+
<li>Support real call to abort_search() instead of killing the solver.</li>
108+
<li>Add a method get_parameters() to CpoSolver to retrieve actual solving parameters.</li>
109+
<li>Fix problem of order of computation of actual solving parameters.</li>
110+
</ul>
111+
</dd>
112+
</dl>
113+
</li>
114+
</ul>
115+
</div>
116+
<div class="section" id="changed-in-2-21-207-2021-06">
117+
<h2>Changed in 2.21.207 (2021.06):<a class="headerlink" href="#changed-in-2-21-207-2021-06" title="Permalink to this headline">&para;</a></h2>
81118
<ul class="simple">
82119
<li><dl class="first docutils">
83120
<dt>In <code class="docutils literal notranslate"><span class="pre">docplex.mp</span></code>:</dt>
@@ -791,7 +828,7 @@ <h3>Navigation</h3>
791828
<li class="right" style="margin-right: 10px">
792829
<a href="genindex.html" title="General Index"
793830
>index</a></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>
831+
<li class="nav-item nav-item-0"><a href="index.html">IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.22 documentation</a> &#187;</li>
795832
</ul>
796833
</div>
797834
<div class="footer" role="contentinfo">

‎docs/README.md.html‎

Lines changed: 57 additions & 57 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.21 documentation</title>
9+
<title>README.md &#8212; IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.22 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.21 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.22 documentation</a> &#187;</li>
3333
</ul>
3434
</div>
3535
<div class="sphinxsidebar" role="navigation" aria-label="main navigation">
@@ -44,60 +44,60 @@ <h3>Navigation</h3>
4444

4545
<div class="section" id="readme-md">
4646
<h1>README.md<a class="headerlink" href="#readme-md" title="Permalink to this headline">&para;</a></h1>
47-
<div class="highlight-text notranslate"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre> 1
48-
2
49-
3
50-
4
51-
5
52-
6
53-
7
54-
8
55-
9
56-
10
57-
11
58-
12
59-
13
60-
14
61-
15
62-
16
63-
17
64-
18
65-
19
66-
20
67-
21
68-
22
69-
23
70-
24
71-
25
72-
26
73-
27
74-
28
75-
29
76-
30
77-
31
78-
32
79-
33
80-
34
81-
35
82-
36
83-
37
84-
38
85-
39
86-
40
87-
41
88-
42
89-
43
90-
44
91-
45
92-
46
93-
47
94-
48
95-
49
96-
50
97-
51
98-
52
99-
53
100-
54</pre></div></td><td class="code"><div class="highlight"><pre><span></span># IBM&amp;reg; Decision Optimization Modeling for Python (DOcplex)
47+
<div class="highlight-text notranslate"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
48+
<span class="normal"> 2</span>
49+
<span class="normal"> 3</span>
50+
<span class="normal"> 4</span>
51+
<span class="normal"> 5</span>
52+
<span class="normal"> 6</span>
53+
<span class="normal"> 7</span>
54+
<span class="normal"> 8</span>
55+
<span class="normal"> 9</span>
56+
<span class="normal">10</span>
57+
<span class="normal">11</span>
58+
<span class="normal">12</span>
59+
<span class="normal">13</span>
60+
<span class="normal">14</span>
61+
<span class="normal">15</span>
62+
<span class="normal">16</span>
63+
<span class="normal">17</span>
64+
<span class="normal">18</span>
65+
<span class="normal">19</span>
66+
<span class="normal">20</span>
67+
<span class="normal">21</span>
68+
<span class="normal">22</span>
69+
<span class="normal">23</span>
70+
<span class="normal">24</span>
71+
<span class="normal">25</span>
72+
<span class="normal">26</span>
73+
<span class="normal">27</span>
74+
<span class="normal">28</span>
75+
<span class="normal">29</span>
76+
<span class="normal">30</span>
77+
<span class="normal">31</span>
78+
<span class="normal">32</span>
79+
<span class="normal">33</span>
80+
<span class="normal">34</span>
81+
<span class="normal">35</span>
82+
<span class="normal">36</span>
83+
<span class="normal">37</span>
84+
<span class="normal">38</span>
85+
<span class="normal">39</span>
86+
<span class="normal">40</span>
87+
<span class="normal">41</span>
88+
<span class="normal">42</span>
89+
<span class="normal">43</span>
90+
<span class="normal">44</span>
91+
<span class="normal">45</span>
92+
<span class="normal">46</span>
93+
<span class="normal">47</span>
94+
<span class="normal">48</span>
95+
<span class="normal">49</span>
96+
<span class="normal">50</span>
97+
<span class="normal">51</span>
98+
<span class="normal">52</span>
99+
<span class="normal">53</span>
100+
<span class="normal">54</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span># IBM&amp;reg; Decision Optimization Modeling for Python (DOcplex)
101101

102102
Welcome to the IBM&amp;reg; Decision Optimization Modeling for Python.
103103
Licensed under the Apache License v2.0.
@@ -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.21 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.22 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.21 documentation");
39+
$("li.nav-item-0 a").text("IBM® Decision Optimization CPLEX® Modeling for Python (DOcplex) V2.22 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.21',
3+
VERSION: 'V2.22',
44
LANGUAGE: 'None',
55
COLLAPSE_INDEX: false,
66
FILE_SUFFIX: '.html',

‎docs/_static/pygments.css‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1+
pre { line-height: 125%; }
2+
td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
3+
span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
4+
td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
5+
span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
16
.highlight .hll { background-color: #ffffcc }
2-
.highlight { background: #eeffcc; }
7+
.highlight { background: #eeffcc; }
38
.highlight .c { color: #408090; font-style: italic } /* Comment */
49
.highlight .err { border: 1px solid #FF0000 } /* Error */
510
.highlight .k { color: #007020; font-weight: bold } /* Keyword */

‎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.21 documentation</title>
9+
<title>Overview of constraint programming &#8212; IBM&reg; Decision Optimization CPLEX&reg; Modeling for Python (DOcplex) V2.22 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.21 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.22 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.21 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.22 documentation</a> &#187;</li>
241241
</ul>
242242
</div>
243243
<div class="footer" role="contentinfo">

‎docs/cp/.doctrees/README.md.doctree‎

209 Bytes
Binary file not shown.

‎docs/cp/.doctrees/basic.color.py.doctree‎

97 Bytes
Binary file not shown.

‎docs/cp/.doctrees/basic.golomb_ruler.py.doctree‎

45 Bytes
Binary file not shown.

‎docs/cp/.doctrees/basic.n_queen.py.doctree‎

61 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)