Merge branch 'master' of github.com:scipopt/PySCIPOpt into param-emph…

…asis-tutorial
scipopt · Oct 2, 2024 · 57b4b64 · 57b4b64
2 parents dd0df4a + af6f171
commit 57b4b64
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -43,24 +43,6 @@
 - Made readStatistics a standalone function
 ### Removed
 
-## 5.1.1 - 2024-06-22
-### Added
-- Added SCIP_STATUS_DUALLIMIT and SCIP_STATUS_PRIMALLIMIT
-- Added SCIPprintExternalCodes (retrieves version of linked symmetry, lp solver, nl solver etc)
-- Added recipe with reformulation for detecting infeasible constraints
-- Wrapped SCIPcreateOrigSol and added tests 
-- Added verbose option for writeProblem and writeParams
-- Expanded locale test
-- Added methods for creating expression constraints without adding to problem
-- Added methods for creating/adding/appending disjunction constraints
-- Added check for pt_PT locale in test_model.py
-- Added SCIPgetOrigConss and SCIPgetNOrigConss Cython bindings. 
-- Added transformed=False option to getConss, getNConss, and getNVars
-### Fixed
-- Fixed locale errors in reading
-### Changed
-### Removed
-
 ## 5.0.1 - 2024-04-05
 ### Added
 - Added recipe for nonlinear objective functions

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ pip install pyscipopt
 ```
 
 For information on specific versions, installation via Conda, and guides for building from source,
-please see the online documentation.
+please see the [online documentation](https://pyscipopt.readthedocs.io/en/latest/install.html).
 
 Building and solving a model
 ----------------------------

diff --git a/docs/install.rst b/docs/install.rst
@@ -2,8 +2,6 @@
 Installation Guide
 ##################
 
-**This file is deprecated and will be removed soon. Please see the online documentation.**
-
 This page will detail all methods for installing PySCIPOpt via package managers,
 which come with their own versions of SCIP. For building PySCIPOpt against your
 own custom version of SCIP, or for building PySCIPOpt from source, visit :doc:`this page </build>`.

diff --git a/src/pyscipopt/scip.pxi b/src/pyscipopt/scip.pxi
@@ -6164,7 +6164,8 @@ cdef class Model:
 
     def solveConcurrent(self):
         """Transforms, presolves, and solves problem using additional solvers which emphasize on
-        finding solutions."""
+        finding solutions.
+        WARNING: This feature is still experimental and prone to some errors."""
         if SCIPtpiGetNumThreads() == 1:
             warnings.warn("SCIP was compiled without task processing interface. Parallel solve not possible - using optimize() instead of solveConcurrent()") 
             self.optimize()