Merge pull request #9 from jurgen-lentz/master

rename GCGModel to Model

Author: jurgen-lentz

CHANGELOG.md

@@ -6,6 +6,11 @@
 ### Changed
 ### Removed
 
+## v0.1.4
+### Changed
+* rename GCGModel to Model
+### Removed
+* pyscipopt.Model not importable with pygcgopt.Model anymore
 ## v0.1.3
 ### Added
 * Initial public release

docs/api/gcgmodel.rst

@@ -3,7 +3,7 @@ API Reference
 
 .. toctree::
 
-    gcgmodel.rst
+    model.rst
     decomposition.rst
     detprobdata.rst
     detector.rst

docs/api/index.rst

@@ -0,0 +1,5 @@
+Model
+*************
+
+.. autoclass:: pygcgopt.gcg.Model
+    :members:

docs/api/model.rst

@@ -1,4 +1,4 @@
-__version__ = '0.1.3'
+__version__ = '0.1.4'
 
 # required for Python 3.8 on Windows
 import os
@@ -8,7 +8,6 @@
 
 # Expose pyscipopt object through pygcgopt
 from pyscipopt import multidict
-from pyscipopt import Model
 from pyscipopt import Benders
 from pyscipopt import Benderscut
 from pyscipopt import Branchrule
@@ -42,5 +41,5 @@
 from pyscipopt import SCIP_ROWORIGINTYPE
 
 # export user-relevant objects
-from pygcgopt.gcg import GCGModel, Detector, PricingSolver
+from pygcgopt.gcg import Model, Detector, PricingSolver
 from pygcgopt.gcg import PY_GCG_PRICINGSTATUS as GCG_PRICINGSTATUS