Skip to content

Commit 85086fa

Browse files
authored
Migrate to Readthedocs and Sphinx (#890)
* Add initial commit for readthedocs * Finish tutorials/model.rst * Add skeleton for readwrite * Add read and write docu * Add outline for expressions * Add expressions * Add outline for vartypes * Add more info to variable.rst * Add cons, var, and cutsel * Add outline for autodoc * Add basic branching rule * Finish rbanching and add sepa tutorial * Add heur to docu * Add lazycons * Fix small errors * Add node selector to docs * Go through writing of all tutorials * Add half complete draft of whyscip * Finish why scip * Finish why scip * Add similar software and logfile reading * Update Changelog and README" git push * rename tutorials * Add \ to asterisk and abs signs * Update nodesel and heur tests * Remove util. Update lazycons * Add autosummary to gitignore * Remove older sphinx themes * Add branch mostinfeas test * Swap out np.inf for python inf
1 parent 68d9f22 commit 85086fa

Some content is hidden

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

45 files changed

+3285
-4591
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ instance/
8181

8282
# Sphinx documentation
8383
docs/_build/
84+
docs/_autosummary/
8485

8586
# PyBuilder
8687
target/

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,15 @@
1111
SCIPgetVarStrongbranchLast, SCIPgetVarStrongbranchNode, SCIPallColsInLP, SCIPcolGetAge
1212
- Added getBipartiteGraphRepresentation
1313
- Added helper functions that facilitate testing
14+
- Added Python definitions and wrappers for SCIPgetNImplVars, SCIPgetNContVars, SCIPvarMayRoundUp,
15+
SCIPvarMayRoundDown, SCIPcreateLPSol, SCIPfeasFloor, SCIPfeasCeil, SCIPfeasRound, SCIPgetPrioChild,
16+
SCIPgetPrioSibling
17+
- Added additional tests to test_nodesel, test_heur, and test_strong_branching
18+
- Migrated documentation to Readthedocs
1419
### Fixed
1520
- Fixed too strict getObjVal, getVal check
1621
### Changed
22+
- Changed createSol to now have an option of initialising at the current LP solution
1723
### Removed
1824

1925
## 5.1.1 - 2024-06-22

README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,17 @@ Please consult the [online documentation](https://scipopt.github.io/PySCIPOpt/do
1717

1818
See [CHANGELOG.md](https://github.com/scipopt/PySCIPOpt/blob/master/CHANGELOG.md) for added, removed or fixed functionality.
1919

20+
You can also build the documentation locally with the command
21+
```shell
22+
pip install -r docs/requirements.txt
23+
sphinx-build docs docs/_build
24+
```
25+
Às the documentation requires additional python packages, one should run the following command
26+
before building the documentation for the first time:
27+
```shell
28+
(venv) pip install -r docs/requirements.txt
29+
```
30+
2031
Installation
2132
------------
2233

docs/DoxygenLayout.xml

Lines changed: 0 additions & 194 deletions
This file was deleted.

docs/Makefile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Minimal makefile for Sphinx documentation
2+
#
3+
4+
# You can set these variables from the command line, and also
5+
# from the environment for the first two.
6+
SPHINXOPTS ?=
7+
SPHINXBUILD ?= sphinx-build
8+
SOURCEDIR = .
9+
BUILDDIR = _build
10+
11+
# Put it first so that "make" without argument is like "make help".
12+
help:
13+
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
14+
15+
.PHONY: help Makefile
16+
17+
# Catch-all target: route all unknown targets to Sphinx using the new
18+
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
19+
%: Makefile
20+
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
294 KB
Loading

docs/_static/skippy_logo_blue.png

165 KB
Loading

docs/api.rst

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
#############
2+
API reference
3+
#############
4+
5+
This page provides an auto-generated summary of PySCIPOpt's API.
6+
7+
SCIP Model
8+
==========
9+
10+
.. autosummary::
11+
:toctree: _autosummary
12+
:recursive:
13+
14+
pyscipopt.Model
15+
16+
SCIP Constraint
17+
===============
18+
19+
.. autosummary::
20+
:toctree: _autosummary
21+
:recursive:
22+
23+
pyscipopt.Constraint
24+
25+
SCIP Variable
26+
=============
27+
28+
.. autosummary::
29+
:toctree: _autosummary
30+
:recursive:
31+
32+
pyscipopt.Variable
33+
34+
SCIP Row
35+
========
36+
37+
.. autosummary::
38+
:toctree: _autosummary
39+
:recursive:
40+
41+
pyscipopt.scip.Row
42+
43+
SCIP Column
44+
===========
45+
46+
.. autosummary::
47+
:toctree: _autosummary
48+
:recursive:
49+
50+
pyscipopt.scip.Column
51+
52+
SCIP Node
53+
=========
54+
55+
.. autosummary::
56+
:toctree: _autosummary
57+
:recursive:
58+
59+
pyscipopt.scip.Node
60+
61+
SCIP Solution
62+
=============
63+
64+
.. autosummary::
65+
:toctree: _autosummary
66+
:recursive:
67+
68+
pyscipopt.scip.Solution
69+
70+
SCIP Event
71+
===========
72+
73+
.. autosummary::
74+
:toctree: _autosummary
75+
:recursive:
76+
77+
pyscipopt.scip.Event
78+
79+

0 commit comments

Comments
 (0)