Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to Readthedocs and Sphinx #890

Merged
merged 32 commits into from
Sep 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c8a8ad1
Add initial commit for readthedocs
Opt-Mucca Aug 23, 2024
700b904
Finish tutorials/model.rst
Opt-Mucca Aug 23, 2024
f53a0d3
Add skeleton for readwrite
Opt-Mucca Aug 23, 2024
be9a6b3
Add read and write docu
Opt-Mucca Aug 23, 2024
4cdf0b2
Add outline for expressions
Opt-Mucca Aug 23, 2024
f55f089
Add expressions
Opt-Mucca Aug 23, 2024
213ddb8
Add outline for vartypes
Opt-Mucca Aug 24, 2024
0d5d1aa
Add more info to variable.rst
Opt-Mucca Aug 24, 2024
6a0dea4
Add cons, var, and cutsel
Opt-Mucca Aug 26, 2024
10c11ab
Add outline for autodoc
Opt-Mucca Aug 26, 2024
7c22107
Add basic branching rule
Opt-Mucca Aug 30, 2024
5c5e60a
Finish rbanching and add sepa tutorial
Opt-Mucca Sep 2, 2024
8505beb
Add heur to docu
Opt-Mucca Sep 2, 2024
1ba96aa
Add lazycons
Opt-Mucca Sep 2, 2024
a1309ec
Fix small errors
Opt-Mucca Sep 2, 2024
677f018
Add node selector to docs
Opt-Mucca Sep 3, 2024
9b01496
Go through writing of all tutorials
Opt-Mucca Sep 3, 2024
91995c4
Add half complete draft of whyscip
Opt-Mucca Sep 3, 2024
43facd5
Finish why scip
Opt-Mucca Sep 3, 2024
5c98b96
Finish why scip
Opt-Mucca Sep 3, 2024
84c446e
Add similar software and logfile reading
Opt-Mucca Sep 4, 2024
7e8665d
Update Changelog and README"
Opt-Mucca Sep 4, 2024
f7acf16
rename tutorials
Opt-Mucca Sep 5, 2024
35cf16e
Add \ to asterisk and abs signs
Opt-Mucca Sep 6, 2024
b92eb72
merge master into branch
Opt-Mucca Sep 6, 2024
9d731eb
Update nodesel and heur tests
Opt-Mucca Sep 6, 2024
0f2a354
Remove util. Update lazycons
Opt-Mucca Sep 6, 2024
e9d393f
Add autosummary to gitignore
Opt-Mucca Sep 6, 2024
e948f17
Remove older sphinx themes
Opt-Mucca Sep 6, 2024
cc3db2d
Add branch mostinfeas test
Opt-Mucca Sep 6, 2024
a9b494b
Swap out np.inf for python inf
Opt-Mucca Sep 6, 2024
81be75e
Add AMPL to general modelling frameworks
Opt-Mucca Sep 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ instance/

# Sphinx documentation
docs/_build/
docs/_autosummary/

# PyBuilder
target/
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,15 @@
SCIPgetVarStrongbranchLast, SCIPgetVarStrongbranchNode, SCIPallColsInLP, SCIPcolGetAge
- Added getBipartiteGraphRepresentation
- Added helper functions that facilitate testing
- Added Python definitions and wrappers for SCIPgetNImplVars, SCIPgetNContVars, SCIPvarMayRoundUp,
SCIPvarMayRoundDown, SCIPcreateLPSol, SCIPfeasFloor, SCIPfeasCeil, SCIPfeasRound, SCIPgetPrioChild,
SCIPgetPrioSibling
- Added additional tests to test_nodesel, test_heur, and test_strong_branching
- Migrated documentation to Readthedocs
### Fixed
- Fixed too strict getObjVal, getVal check
### Changed
- Changed createSol to now have an option of initialising at the current LP solution
### Removed

## 5.1.1 - 2024-06-22
Expand Down
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ Please consult the [online documentation](https://scipopt.github.io/PySCIPOpt/do

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

You can also build the documentation locally with the command
```shell
pip install -r docs/requirements.txt
sphinx-build docs docs/_build
```
Às the documentation requires additional python packages, one should run the following command
before building the documentation for the first time:
```shell
(venv) pip install -r docs/requirements.txt
```

Installation
------------

Expand Down
194 changes: 0 additions & 194 deletions docs/DoxygenLayout.xml

This file was deleted.

20 changes: 20 additions & 0 deletions docs/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXOPTS ?=
SPHINXBUILD ?= sphinx-build
SOURCEDIR = .
BUILDDIR = _build

# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

.PHONY: help Makefile

# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/skippy_logo_blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
79 changes: 79 additions & 0 deletions docs/api.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
#############
API reference
#############

This page provides an auto-generated summary of PySCIPOpt's API.

SCIP Model
==========

.. autosummary::
:toctree: _autosummary
:recursive:

pyscipopt.Model

SCIP Constraint
===============

.. autosummary::
:toctree: _autosummary
:recursive:

pyscipopt.Constraint

SCIP Variable
=============

.. autosummary::
:toctree: _autosummary
:recursive:

pyscipopt.Variable

SCIP Row
========

.. autosummary::
:toctree: _autosummary
:recursive:

pyscipopt.scip.Row

SCIP Column
===========

.. autosummary::
:toctree: _autosummary
:recursive:

pyscipopt.scip.Column

SCIP Node
=========

.. autosummary::
:toctree: _autosummary
:recursive:

pyscipopt.scip.Node

SCIP Solution
=============

.. autosummary::
:toctree: _autosummary
:recursive:

pyscipopt.scip.Solution

SCIP Event
===========

.. autosummary::
:toctree: _autosummary
:recursive:

pyscipopt.scip.Event


Loading
Loading