Commit 2909536e authored by Guillaume Sagnol's avatar Guillaume Sagnol

Merge branch 'master_github'

parents 2aca3bd5 03d67d3c
# file GENERATED by distutils, do NOT edit
CHANGES.txt
LICENSE.txt
README.txt
README.rst
setup.py
doc/api.rst
doc/changes.rst
......
include *.txt
include *.rst
recursive-include doc *.rst
recursive-include doc/_templates *.html
recursive-include doc/_static *
......@@ -61,7 +61,7 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
projectname = u'picos_tututu'
projectname = u'picos'
project = u'picos'
copyright = u'2012, Guillaume Sagnol'
......@@ -72,7 +72,7 @@ copyright = u'2012, Guillaume Sagnol'
# The short X.Y version.
version = '1.1'
# The full version, including alpha/beta/rc tags.
release = '1.1.1dev'
release = '1.1.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -6,7 +6,7 @@ Download
The latest version of PICOS can be downloaded here:
`picos-1.1.0 <dist/PICOS-1.1.0.tar.gz>`_
`picos-1.1.1 <dist/PICOS-1.1.1.tar.gz>`_
Installation instructions are explained
:ref:`here <requirements>`.
......@@ -15,6 +15,8 @@ Installation instructions are explained
**Older versions**
`picos-1.1.0 <dist/PICOS-1.1.0.tar.gz>`_
`picos-1.0.2 <dist/PICOS-1.0.2.tar.gz>`_
`picos-1.0.1 <dist/PICOS-1.0.1.tar.gz>`_
......
......@@ -19,7 +19,7 @@ see more about PICOS in the :ref:`introduction <intro>`.
The latest version can be downloaded :ref:`here <download>`,
and can be installed by following :ref:`these instructions <requirements>`.
Alternatively, you can clone the latest development version from **github**:
``$ git clone https://github.com/gsagnol/picos.git``. If you whish to collaborate on PICOS,
``$ git clone https://github.com/gsagnol/picos.git``. If you wish to collaborate on PICOS,
please make a pull request on `github <http://github.com/gsagnol/picos>`_.
This documentation contains a :ref:`tutorial <tuto>` and some :ref:`examples <examples>`,
......@@ -32,6 +32,12 @@ on every function of PICOS.
**News**
* xx Aug. 15: **Picos** :ref:`1.1.1 <download>` **Released**
Minor release with following changes:
* Partial trace of an Affine Expression, cf. :func:`partial_trace() <picos.tools.partial_trace>`
* Bugfix for compatibility with python3 (thanks to `Sergio Callegari <http://www.unibo.it/faculty/sergio.callegari>`_)
* Better PEP8-compliance
* 15 Apr. 15: **Picos** :ref:`1.1.0 <download>` **Released**
* PICOS is now compatible with **python 3+** (and remains compatible with python 2.6+). Many thanks to `Sergio Callegari <http://www.unibo.it/faculty/sergio.callegari>`_ for this compatibility layer ! If you plan to work with PICOS and python3, think to install the most recent version of your solver (Mosek, Cplex, Gurobi, or Cvxopt). SCIP is not supported in python3+ at this point (but remains supported with python 2.x).
......
......@@ -92,6 +92,8 @@
+--------------------------------------------------------------+-------------------------------------------+
|:func:`partial_transpose() <picos.tools.partial_transpose>` | partial transposition |
+--------------------------------------------------------------+-------------------------------------------+
|:func:`partial_trace() <picos.tools.partial_trace>` | partial trace |
+--------------------------------------------------------------+-------------------------------------------+
========================================
......
......@@ -7,4 +7,4 @@
===============
.. automodule:: picos.tools
:members: available_solvers, ball, detrootn, diag, diag_vect, eval_dict, flow_Constraint, geomean, import_cbf, lambda_max, lambda_min, lowtri, lse, new_param, norm, partial_transpose, _retrieve_matrix, simplex, sum, sum_k_largest, sum_k_largest_lambda, sum_k_smallest, sum_k_smallest_lambda, trace, tracepow, truncated_simplex
\ No newline at end of file
:members: available_solvers, ball, detrootn, diag, diag_vect, eval_dict, flow_Constraint, geomean, import_cbf, lambda_max, lambda_min, lowtri, lse, new_param, norm, partial_trace, partial_transpose, _retrieve_matrix, simplex, sum, sum_k_largest, sum_k_largest_lambda, sum_k_smallest, sum_k_smallest_lambda, trace, tracepow, truncated_simplex
\ No newline at end of file
# coding: utf-8
#-------------------------------------------------------------------
#Picos 1.1.1dev : A pyton Interface To Conic Optimization Solvers
#Picos 1.1.1 : A pyton Interface To Conic Optimization Solvers
#Copyright (C) 2012 Guillaume Sagnol
#
#This program is free software: you can redistribute it and/or modify
......@@ -28,9 +28,9 @@
from .problem import *
from .expression import *
from .constraint import *
from .tools import sum,lse,new_param,diag,diag_vect,geomean,norm,tracepow,trace,detrootn,QuadAsSocpError,NotAppropriateSolverError,NonConvexError,flow_Constraint,ball,simplex,truncated_simplex,partial_transpose,import_cbf,sum_k_largest,sum_k_largest_lambda,lambda_max,sum_k_smallest,sum_k_smallest_lambda,lambda_min
from .tools import sum,lse,new_param,diag,diag_vect,geomean,norm,tracepow,trace,detrootn,QuadAsSocpError,NotAppropriateSolverError,NonConvexError,flow_Constraint,ball,simplex,truncated_simplex,partial_trace,partial_transpose,import_cbf,sum_k_largest,sum_k_largest_lambda,lambda_max,sum_k_smallest,sum_k_smallest_lambda,lambda_min
__all__=['tools','constraint','expression','problem']
__version_info__ = ('1', '1', '1dev')
__version_info__ = ('1', '1', '1')
__version__ = '.'.join(__version_info__)
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -2,13 +2,13 @@ from distutils.core import setup
setup(
name='PICOS',
version='1.1.1dev',
version='1.1.1',
author='G. Sagnol',
author_email='sagnol@zib.de',
packages=['picos'],
license='LICENSE.txt',
description='A Python Interface to Conic Optimization Solvers.',
long_description=open('README.txt').read(),
long_description=open('README.rst').read(),
install_requires=[
"CVXOPT >= 1.1.4",
"numpy >= 1.6.2",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment