Merge branch 'master' into equiv-vii

Author: mkoeppe

.travis-install.sh

@@ -13,7 +13,7 @@ if [ "${SAGE_AGE}" == "-1" ]; then
  mkdir -p SageMath
  sudo sage -pip install sphinxcontrib-websupport
 else
-  SAGE_IMAGE=`python2 -c "import sage_version; print sage_version.get_all_version_names('${SAGE_SERVER}index.html',${SAGE_AGE})"`
+  SAGE_IMAGE=`python2 -c "import sage_version; print sage_version.get_all_version_names('${SAGE_SERVER}',${SAGE_AGE})"`
   cd $HOME
   echo "Obtaining Sage image:" ${SAGE_IMAGE}
   if [ ! -x SageMath/sage ] ; then

.travis-test.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
 set -e
+$HOME/SageMath/sage -pip -vvv install --upgrade .
 make check-long SAGE="$HOME/SageMath/sage" #SAGE_CHECK_FLAGS="--verbose"
 make doc SAGE="$HOME/SageMath/sage"

Dockerfile

@@ -0,0 +1,10 @@
+# Dockerfile for binder
+# Reference: https://mybinder.readthedocs.io/en/latest/dockerfile.html#preparing-your-dockerfile
+
+FROM sagemath/sagemath:latest
+
+# Copy the contents of the repo in ${HOME}
+COPY --chown=sage:sage . ${HOME}
+
+# Install this package and dependencies
+RUN sage -pip install .

Makefile

@@ -1,49 +1,50 @@
 SAGE=sage
 
-SAGEFILES =					\
-	bug_examples.sage			\
-	compendium_procedures.sage		\
-	continuous_case.sage			\
-	discontinuous_case.sage			\
-	discrete_case.sage			\
-	extreme_functions_in_literature.sage	\
-	extreme_functions_sporadic.sage		\
-	intervals.sage				\
-	real_number_field.sage			\
-	fast_linear.sage			\
-	functions.sage				\
-	parametric.sage				\
-	semialgebraic_mathematica.sage		\
-	simple_extremality_test.sage		\
-	survey_examples.sage			\
-	extreme_functions_mlr_cpl3.sage		\
-	quasi_periodic.sage			\
-	crazy_perturbation_examples.sage	\
-	crazy_perturbation.sage			\
-	kslope_ppl_mip.py			\
-	vertex_enumeration.py			\
-	kslope_pattern.sage			\
-	2q_mip.sage				\
-	kslope_mip.sage				\
-	animation_2d_diagram.sage		\
-	lifting_project.sage
+SAGEFILES =									\
+	cutgeneratingfunctionology/igp/bug_examples.sage			\
+	cutgeneratingfunctionology/igp/compendium_procedures.sage		\
+	cutgeneratingfunctionology/igp/continuous_case.sage			\
+	cutgeneratingfunctionology/igp/discontinuous_case.sage			\
+	cutgeneratingfunctionology/igp/discrete_case.sage			\
+	cutgeneratingfunctionology/igp/extreme_functions_in_literature.sage	\
+	cutgeneratingfunctionology/igp/extreme_functions_sporadic.sage		\
+	cutgeneratingfunctionology/igp/intervals.sage				\
+	cutgeneratingfunctionology/igp/real_number_field.sage			\
+	cutgeneratingfunctionology/igp/fast_linear.sage				\
+	cutgeneratingfunctionology/igp/functions.sage				\
+	cutgeneratingfunctionology/igp/parametric.sage				\
+	cutgeneratingfunctionology/igp/semialgebraic_mathematica.sage		\
+	cutgeneratingfunctionology/igp/simple_extremality_test.sage		\
+	cutgeneratingfunctionology/igp/survey_examples.sage			\
+	cutgeneratingfunctionology/igp/extreme_functions_mlr_cpl3.sage		\
+	cutgeneratingfunctionology/igp/quasi_periodic.sage			\
+	cutgeneratingfunctionology/igp/crazy_perturbation_examples.sage		\
+	cutgeneratingfunctionology/igp/crazy_perturbation.sage			\
+	cutgeneratingfunctionology/igp/kslope_ppl_mip.py			\
+	cutgeneratingfunctionology/igp/vertex_enumeration.py			\
+	cutgeneratingfunctionology/igp/kslope_pattern.sage			\
+	cutgeneratingfunctionology/igp/2q_mip.sage				\
+	cutgeneratingfunctionology/igp/kslope_mip.sage				\
+	cutgeneratingfunctionology/igp/animation_2d_diagram.sage		\
+	cutgeneratingfunctionology/igp/lifting_project.sage
 
 ## Don't test; currently broken
-# 	parametric_cpl.sage			\
+# 	cutgeneratingfunctionology/igp/parametric_cpl.sage			\
 
 
 # Dual feasible functions
-SAGEFILES +=					\
-	dff_functions.sage			\
-	dff_test_plot.sage			\
-	discontinuous_dff.sage			\
-	computer_based_search_naive_dff.sage	\
-	gdff_linear_test.sage
+SAGEFILES +=								    \
+	cutgeneratingfunctionology/dff/dff_functions.sage		    \
+	cutgeneratingfunctionology/dff/dff_test_plot.sage		    \
+	cutgeneratingfunctionology/dff/discontinuous_dff.sage		    \
+	cutgeneratingfunctionology/dff/computer_based_search_naive_dff.sage \
+	cutgeneratingfunctionology/dff/gdff_linear_test.sage		    \
+	cutgeneratingfunctionology/dff/Gomory_conversion.sage
 
 # Multirow
-SAGEFILES +=					\
-	piecewise_functions.sage		\
-	lifting_region.sage
+SAGEFILES +=								\
+	cutgeneratingfunctionology/multirow/piecewise_functions.sage	\
+	cutgeneratingfunctionology/multirow/lifting_region.sage
 
 all:
 	@echo "No need to 'make' anything. Just run it in Sage; see README.rst"
@@ -52,11 +53,11 @@ install:
 	@echo "No need to install anything. Just run it in Sage; see README.rst"
 
 check: check-encoding
-	$(SAGE) -tp 4 $(SAGEFILES)
+	PYTHONPATH=`pwd` $(SAGE) -tp 4 --force_lib $(SAGEFILES)
 
 check-long: check-encoding
 	cp .check-long-timings.json .tmp_check-long-timings.json
-	$(SAGE) -tp 4 --long --stats-path .tmp_check-long-timings.json $(SAGE_CHECK_FLAGS) $(SAGEFILES)
+	PYTHONPATH=`pwd` $(SAGE) -tp 4 --force_lib --long --stats-path .tmp_check-long-timings.json $(SAGE_CHECK_FLAGS) $(SAGEFILES)
 	rm .tmp_check-long-timings.json
 
 check-encoding:
@@ -83,4 +84,7 @@ clean: clean-doc
 clean-doc:
 	cd docs && $(SAGE) -sh -c "make clean"
 
+demo.ipynb: demo.rst
+	$(SAGE) -rst2ipynb $< > $@
+
 .PHONY: all build install test coverage sdist pip-install pip-uninstall pip-develop clean clean-doc doc doc-pdf

README.rst

@@ -30,6 +30,18 @@ License
 The code is released under the GNU General Public License, version 2,
 or any later version as published by the Free Software Foundation. 
 
+Documentation
+-------------
+
+http://mkoeppe.github.io/cutgeneratingfunctionology/doc/html/
+
+Run it on mybinder.org
+----------------------
+
+.. image:: https://mybinder.org/badge_logo.svg
+           :target: https://mybinder.org/v2/gh/mkoeppe/cutgeneratingfunctionology/master?filepath=demo.ipynb
+
+
 How to run the code in a local copy of Sage
 -------------------------------------------
 
@@ -43,9 +55,9 @@ How to run the code in a local copy of Sage
 
 4. At the Sage prompt, type::
 
-    import igp; from igp import *
+    import cutgeneratingfunctionology.igp as igp; from cutgeneratingfunctionology.igp import *
 
-5. Follow the instructions and examples in `<demo.sage>`_.
+5. Follow the instructions and examples in `<demo.rst>`_.
 
 
 How to run the code online via cloud.sagemath.com
@@ -69,7 +81,7 @@ How to run the code online via cloud.sagemath.com
 
 8. Type::
 
-    import igp; from igp import *
+    import cutgeneratingfunctionology.igp as igp; from cutgeneratingfunctionology.igp import *
 
    and hit shift+enter
 

VERSION

@@ -1 +1 @@
-1.0+git
+1.2+git

cutgeneratingfunctionology/__init__.py

@@ -0,0 +1,7 @@
+## Module
+
+from __future__ import print_function, absolute_import
+
+del print_function, absolute_import
+
+from . import igp, multirow, dff

Gomory_conversion.sage …functionology/dff/Gomory_conversion.sageGomory_conversion.sage renamed to cutgeneratingfunctionology/dff/Gomory_conversion.sage Gomory_conversion.sage renamed to cutgeneratingfunctionology/dff/Gomory_conversion.sage

@@ -1,3 +1,4 @@
+from six.moves import range
 def conversion_from_DFF_to_GJ(phi):
     bkpt=phi.end_points()
     value=phi.values_at_end_points()

cutgeneratingfunctionology/dff/__init__.py

@@ -0,0 +1,16 @@
+# Dual feasible functions
+
+from __future__ import absolute_import
+from sage.all import *
+from cutgeneratingfunctionology.igp import *
+
+dff_dir =  os.path.dirname(__file__)
+if dff_dir:
+    dff_dir += "/"
+
+load(dff_dir + "gdff_linear_test.sage")
+load(dff_dir + "dff_functions.sage")
+load(dff_dir + "dff_test_plot.sage")
+load(dff_dir + "discontinuous_dff.sage")
+load(dff_dir + "computer_based_search_naive_dff.sage")
+load(dff_dir + "Gomory_conversion.sage")

computer_based_search_naive_dff.sage …dff/computer_based_search_naive_dff.sagecomputer_based_search_naive_dff.sage renamed to cutgeneratingfunctionology/dff/computer_based_search_naive_dff.sage computer_based_search_naive_dff.sage renamed to cutgeneratingfunctionology/dff/computer_based_search_naive_dff.sage

@@ -1,10 +1,4 @@
-# Make sure current directory is in path.  
-# That's not true while doctesting (sage -t).
-if '' not in sys.path:
-    sys.path = [''] + sys.path
-
-from igp import *
-
+from six.moves import range
 def search_example_continuous_dff(q):
     lp = MixedIntegerLinearProgram(base_ring=QQ)
     x = lp.new_variable()