Merge pull request #161 from NREL/engage45-disable-xpress

engage45-disable xpress solver
NREL · May 20, 2024 · a92c4d2 · a92c4d2
2 parents a93d0f4 + fa00c76
commit a92c4d2
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 29 deletions.
diff --git a/calliope_app/api/fixtures/admin_run_parameter.json b/calliope_app/api/fixtures/admin_run_parameter.json
@@ -409,7 +409,7 @@
       "user_visibility": "True",
       "can_evolve": "False",
       "name": "solver",
-      "default_value": "amplxpress",
+      "default_value": "appsi_highs",
       "choices": "[\"glpk\",\"appsi_highs\",\"amplxpress\",\"xpress_direct\"]"
     }
   },

diff --git a/calliope_app/requirements.txt b/calliope_app/requirements.txt
@@ -1,5 +1,5 @@
 django_ratelimit==4.1.0
-git+https://github.com/NREL/GEOPHIRES-X.git#egg=geophires-x 
+git+https://github.com/NREL/GEOPHIRES-X.git#egg=geophires-x
 boto3==1.24.37
 celery[redis]==5.3.0
 django==3.2.25
@@ -30,4 +30,4 @@ pyomo == 6.7.0
 ruamel.yaml == 0.16.0
 scikit-learn >= 1.1.1
 xarray >= 2022.6.0
-xpress >= 8.12.3
+highspy >= 1.5.3
diff --git a/docs/_sources/optimization-solvers.rst.txt b/docs/_sources/optimization-solvers.rst.txt
@@ -32,14 +32,9 @@ However we didn't provide in docker environment for development purpose, if you
 HiGHS
 ------
 
-In the deployed Engage application at NREL, it uses commercial `FICO XPRESS <https://www.fico.com/en/products/fico-xpress-optimization>`_ 
-to solve Calliope models with fast speed and large memory in compute node.
-
-HiGHS
-------
-
-NREL Engage deployment also integrates the commercial solver `FICO XPRESS <https://www.fico.com/en/products/fico-xpress-optimization>`_
-to solve Calliope models with high performance and large compute resources.
+In the deployed Engage application at NREL, it uses high-performance solver `HiGHS <https://highs.dev/>`_
+to solve Calliope models with fast speed and large memory in compute node. It's open-source, for more information,
+please refer to its official documentation `https://highs.dev/#docs <https://highs.dev/#docs>`_
 
 More Choice
 -----------

diff --git a/docs/index.html b/docs/index.html
@@ -67,7 +67,6 @@ <h1>Welcome to Engage’s documentation!<a class="headerlink" href="#welcome-to-
 <li class="toctree-l2"><a class="reference internal" href="optimization-solvers.html#glpk">GLPK</a></li>
 <li class="toctree-l2"><a class="reference internal" href="optimization-solvers.html#scip">SCIP</a></li>
 <li class="toctree-l2"><a class="reference internal" href="optimization-solvers.html#highs">HiGHS</a></li>
-<li class="toctree-l2"><a class="reference internal" href="optimization-solvers.html#id4">HiGHS</a></li>
 <li class="toctree-l2"><a class="reference internal" href="optimization-solvers.html#more-choice">More Choice</a></li>
 </ul>
 </li>

diff --git a/docs/optimization-solvers.html b/docs/optimization-solvers.html
@@ -58,13 +58,9 @@ <h2>SCIP<a class="headerlink" href="#scip" title="Permalink to this heading">¶<
 </section>
 <section id="highs">
 <h2>HiGHS<a class="headerlink" href="#highs" title="Permalink to this heading">¶</a></h2>
-<p>In the deployed Engage application at NREL, it integrates high-performance open-source solver <a class="reference external" href="https://highs.dev/">HiGHS</a>
-to solve Calliope models with fast speed and large memory in compute node.</p>
-</section>
-<section id="id4">
-<h2>HiGHS<a class="headerlink" href="#id4" title="Permalink to this heading">¶</a></h2>
-<p>NREL Engage deployment also integrates the commercial solver <a class="reference external" href="https://www.fico.com/en/products/fico-xpress-optimization">FICO XPRESS</a>
-to solve Calliope models with high performance and large compute resources.</p>
+<p>In the deployed Engage application at NREL, it uses high-performance solver <a class="reference external" href="https://highs.dev/">HiGHS</a>
+to solve Calliope models with fast speed and large memory in compute node. It’s open-source, for more information,
+please refer to its official documentation <a class="reference external" href="https://highs.dev/#docs">https://highs.dev/#docs</a></p>
 </section>
 <section id="more-choice">
 <h2>More Choice<a class="headerlink" href="#more-choice" title="Permalink to this heading">¶</a></h2>
@@ -101,7 +97,7 @@ <h3>Navigation</h3>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">Optimization Solvers</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#glpk">GLPK</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#scip">SCIP</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#xpress">XPRESS</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#highs">HiGHS</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#more-choice">More Choice</a></li>
 </ul>
 </li>