Skip to content

Commit ac80e1a

Browse files
committed
release 2.24.232
1 parent 91ad88d commit ac80e1a

4 files changed

Lines changed: 14 additions & 8 deletions

File tree

0 Bytes
Binary file not shown.

docs/mp/_modules/docplex/mp/solution.html

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@ <h1>Source code for docplex.mp.solution</h1><div class="highlight"><pre>
6969
<span class="kn">import</span> <span class="nn">sys</span>
7070
<span class="kn">import</span> <span class="nn">copy</span>
7171

72-
<span class="kn">from</span> <span class="nn">cplex._internal._subinterfaces</span> <span class="kn">import</span> <span class="n">CutType</span>
72+
<span class="k">try</span><span class="p">:</span>
73+
<span class="kn">from</span> <span class="nn">cplex._internal._subinterfaces</span> <span class="kn">import</span> <span class="n">CutType</span>
74+
<span class="k">except</span><span class="p">:</span>
75+
<span class="n">CutType</span> <span class="o">=</span> <span class="nb">list</span>
7376

7477
<span class="k">try</span><span class="p">:</span> <span class="c1"># pragma: no cover</span>
7578
<span class="kn">from</span> <span class="nn">itertools</span> <span class="kn">import</span> <span class="n">zip_longest</span> <span class="k">as</span> <span class="n">izip_longest</span>
@@ -911,18 +914,21 @@ <h1>Source code for docplex.mp.solution</h1><div class="highlight"><pre>
911914
<span class="sd">&quot;&quot;&quot; Returns the number of cuts for a specific type.</span>
912915

913916
<span class="sd"> :param cut_type: a cut type.</span>
914-
<span class="sd"> :return: the number of cuts associated to this type of cut.</span>
917+
<span class="sd"> :return: the number of cuts associated to this type of cut. 0 if CPLEX is not present</span>
915918
<span class="sd"> &quot;&quot;&quot;</span>
916919
<span class="n">cut_type_instance</span> <span class="o">=</span> <span class="n">CutType</span><span class="p">()</span>
917920
<span class="k">if</span> <span class="n">cut_type</span> <span class="ow">in</span> <span class="n">cut_type_instance</span><span class="p">:</span>
918-
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">get_cuts</span><span class="p">()[</span><span class="n">cut_type</span><span class="p">]</span>
919-
<span class="n">handle_error</span><span class="p">(</span><span class="n">logger</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">model</span><span class="p">,</span> <span class="n">error</span><span class="o">=</span><span class="s2">&quot;raise&quot;</span><span class="p">,</span> <span class="n">msg</span><span class="o">=</span><span class="s2">&quot;Cut type does not exist&quot;</span><span class="p">)</span></div>
921+
<span class="n">cuts</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">get_cuts</span><span class="p">()</span>
922+
<span class="n">name</span> <span class="o">=</span> <span class="n">cut_type_instance</span><span class="p">[</span><span class="n">cut_type</span><span class="p">]</span>
923+
<span class="k">return</span> <span class="n">cuts</span><span class="p">[</span><span class="n">name</span><span class="p">]</span>
924+
<span class="k">return</span> <span class="mi">0</span></div>
925+
920926

921927

922928
<div class="viewcode-block" id="SolveSolution.get_cuts"><a class="viewcode-back" href="../../../docplex.mp.solution.html#docplex.mp.solution.SolveSolution.get_cuts">[docs]</a> <span class="k">def</span> <span class="nf">get_cuts</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
923929
<span class="sd">&quot;&quot;&quot; Returns the number of cuts under the form of a dict(type -&gt; number).</span>
924930

925-
<span class="sd"> :return: the number of cuts under the form of a dict(type -&gt; number).</span>
931+
<span class="sd"> :return: the number of cuts under the form of a dict(type -&gt; number). Empty dict if CPLEX is not present.</span>
926932
<span class="sd"> &quot;&quot;&quot;</span>
927933
<span class="n">m</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">model</span>
928934
<span class="bp">self</span><span class="o">.</span><span class="n">ensure_cuts</span><span class="p">(</span><span class="n">m</span><span class="p">,</span> <span class="n">m</span><span class="o">.</span><span class="n">get_engine</span><span class="p">())</span>

docs/mp/docplex.mp.solution.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ <h1>docplex.mp.solution module<a class="headerlink" href="#docplex-mp-solution-m
424424
<col class="field-name" />
425425
<col class="field-body" />
426426
<tbody valign="top">
427-
<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">the number of cuts under the form of a dict(type -&gt; number).</td>
427+
<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">the number of cuts under the form of a dict(type -&gt; number). Empty dict if CPLEX is not present.</td>
428428
</tr>
429429
</tbody>
430430
</table>
@@ -458,7 +458,7 @@ <h1>docplex.mp.solution module<a class="headerlink" href="#docplex-mp-solution-m
458458
<tbody valign="top">
459459
<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>cut_type</strong> &#8211; a cut type.</td>
460460
</tr>
461-
<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">the number of cuts associated to this type of cut.</td>
461+
<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">the number of cuts associated to this type of cut. 0 if CPLEX is not present</td>
462462
</tr>
463463
</tbody>
464464
</table>

0 commit comments

Comments
 (0)