Commit 2aca3bd5 authored by Guillaume Sagnol's avatar Guillaume Sagnol

file removed to merge

parents c8c414e2 7e6695fa

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
# C extensions
*.so
# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg
# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec
# Installer logs
pip-log.txt
pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover
# Translations
*.mo
*.pot
# Django stuff:
*.log
# Sphinx documentation
docs/_build/
# PyBuilder
target/
......@@ -2,7 +2,6 @@
CHANGES.txt
LICENSE.txt
README.txt
monomials.txt
setup.py
doc/api.rst
doc/changes.rst
......
PICOS is a user friendly interface
`PICOS <http://picos.zib.de/>`_ is a user friendly interface
to several conic and integer programming solvers,
very much like `YALMIP <http://users.isy.liu.se/johanl/yalmip/>`_
or `CVX <http://cvxr.com/cvx/>`_ under `MATLAB <http://www.mathworks.com/>`_.
......
......@@ -15,13 +15,19 @@ et change version num dans conf.py and setup.py and __init__.py
make new directory in the full_html directory and update the symolic link "last" with the ".." trick
#git clone https://github.com/gsagnol/picos.git (to clone)
merge master into master_github:
##merge master into master_github:
git checkout master_github
git merge master
<if needed git rm of files that should not be there (RELEASE_CHECK?)>
##<if needed git rm of files that should not be there>
git rm doc/RELEASE_CHECK
git rm doc/_build
git rm doc/full_html
commit and push on master_github:
##commit and push on master_github:
git commit -a -m 'new rev'
git push origin master_github
git push github master_github
<login with sagnol@zib.de>
##<login with sagnol@zib.de>
git checkout master
website: ask Paul how to make redirections ?
dualize does not work on cplxsdp
solve re3 with solveviadual (pb matrice pas symmetrique -> but OK with A+A.H/2: check)
problem de rang avec cvxopt: remove constraints redondantes ?
add new contributors (Marco Dalai, Peter Wittek ?)
trace (AM^p)
robust -- uncertainty sets
read solution partially
fix some variables as constant
solve_via_dual avec cvxopt -- something special to do (finir primalize())
probleme qd solve problems 2 times in a row sequentially (test_cutting_plane.py avec mosek6, but only at zib (?))
problem avec duals de gurobi pour probleme dsocp de test_picos.py (faire testSOCP5 ?). Bug gurobi -> min example ?
write_to_file --> scaled vars [mettre ds nom variable ?]
file reader
mps writer
dat-s writer with option to desymmetrize the matrices
Better Exception handling in _retrieve_matrix
quad expression of dimension>1 ?
QP avec cvxopt
doc populate et related properties (number_solutions,value_alt,...)
and options
* pool_size=None (solver default) : maximum number of computed
solutions in the solution pool.
* pool_gap = None (0%) : keeps only the solution
within this gap in the pool
duals avec zibopt ?
documenter dat-sx format ?
sqp method and related options:
* step_sqp=1 : 'first step length for the sequential quadratic programming procedure'
* harmonic_steps=True : step at the ith step of the sqp procedure is step_sqp/i]
no string mode.
generaliser les inplace operators (avoid seelfcopy as much as possible)
lancer script add_google_script
Changer CHANGE file
Creer dist file (python setup.py sdist)
move to /www, and change root-index with 3 <meta tags> and $sed -i 's/href="/href="v013\//g' index.html
Register on pypi (python setup.py register, username guillaume.sagnol)
sed -i 's/Picos 0\.1\.0/Picos 0\.1\.1/g' picos/*.py
et change version num dans conf.py and setup.py and __init__.py
This diff is collapsed.
import os
files = os.popen('ls full_html/last/*.html').readlines()
files = [f[:-1] for f in files if f[:6] not in ('search','py-mod','genind')]
for f in files:
fi=open(f,'r')
fitmp=open(f+'tmp','w')
line = fi.readline()
while '</head>' not in line:
fitmp.write(line)
line = fi.readline()
fitmp.write('\n')
fitmp.write('\n')
fitmp.write(' <script type="text/javascript">\n')
fitmp.write('\n')
fitmp.write(' var _gaq = _gaq || [];\n')
fitmp.write(" _gaq.push(['_setAccount', 'UA-33037163-1']);\n")
fitmp.write(" _gaq.push(['_trackPageview']);\n")
fitmp.write('\n')
fitmp.write(" (function() {\n")
fitmp.write(" var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n")
fitmp.write(" ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\n")
fitmp.write(" var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n")
fitmp.write(" })();\n")
fitmp.write('\n')
fitmp.write(" </script>\n")
fitmp.write('\n')
while line:
if 'tar.gz' in line:
vsplit=line.split('tar.gz')
version=vsplit[0].split('PICOS')[1][1:-1]
vsplit=version.split('.')
ocstring=('''onClick="javascript: _gaq.push(['_trackPageview', '/downloads/version'''
+str(vsplit[0]) +str(vsplit[1]) +str(vsplit[2])
+ '''']);"''')
indtar = line.index('tar.gz') + 7
line = line[:indtar]+' '+ocstring+line[indtar:]
fitmp.write(line)
line = fi.readline()
fi.close()
fitmp.close()
os.system('mv '+f+'tmp '+f)
#newlines =['<body>',
#'<div class="admonition warning">',
#'<p class="first admonition-title">Warning</p>',
#'<p class="last">You are consulting the doc of a former version of PICOS.',
#'The latest version is <a href="../index.html">HERE</a>. </p>',
#'</div>'
#]
newlines = [
'<div role="main" class="document">',