URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4cc67e2022758... Merge: 7bc36b69c0442ba1e221a3f071698c1a7df50912 1ac324043fc85fee09587c2a3aea3228732dd582 Author: Marco Poletti poletti.marco@gmail.com Date: Mon Sep 20 09:16:24 2010 +0200

Merge remote branch 'origin/sparse_matrices' into MPI

Conflicts: src/CO_Tree.defs.hh src/CO_Tree.templates.hh src/MIP_Problem.defs.hh src/Sparse_Row.cc

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1ac324043fc85... Author: Marco Poletti poletti.marco@gmail.com Date: Mon Sep 20 08:57:39 2010 +0200

Sparse_Row: weaken the lower_bound() requirements on the argument.

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=23bd68d17e27f... Author: Marco Poletti poletti.marco@gmail.com Date: Mon Sep 20 08:56:47 2010 +0200

Sparse_Row: make the constructor from a Dense_Row work even when Coefficient_traits::const_reference is Coefficient.

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=670621abc7309... Author: Marco Poletti poletti.marco@gmail.com Date: Sun Sep 19 16:42:03 2010 +0200

MIP_Problem: add a linear_combine() method that takes a Dense_Row and a Sparse_Row, to re-allow dense working costs with sparse matrices.

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=33c81bff707ab... Author: Marco Poletti poletti.marco@gmail.com Date: Sun Sep 19 16:39:41 2010 +0200

MIP_Problem: add assertion.

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e36503c4407e7... Author: Marco Poletti poletti.marco@gmail.com Date: Sun Sep 19 16:39:14 2010 +0200

MIP_Problem: use working_cost_type instead of using Row directly. Remove unnecessary specialized implementation for sparse working costs.

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=16f3e918c5fce... Author: Marco Poletti poletti.marco@gmail.com Date: Sat Sep 18 19:45:16 2010 +0200

Sparse_Row, Dense_Row: rename find_create() methods into insert().

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ae21af77d26ce... Author: Marco Poletti poletti.marco@gmail.com Date: Sat Sep 18 18:38:25 2010 +0200

Sparse_Row: add documentation.

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4664394037133... Author: Marco Poletti poletti.marco@gmail.com Date: Sat Sep 18 18:34:06 2010 +0200

test/Sparse_Matrix: add test for the Sparse_Row's constructor from a Dense_Row.

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2fe651ae4ee6e... Author: Marco Poletti poletti.marco@gmail.com Date: Sat Sep 18 18:33:31 2010 +0200

Sparse_Row: add a constructor from a Dense_Row.

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9cd84e2dc61ee... Author: Marco Poletti poletti.marco@gmail.com Date: Sat Sep 18 18:33:06 2010 +0200

CO_Tree: add a constructor from a sequence of elements.

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=35d00bb24afe4... Author: Marco Poletti poletti.marco@gmail.com Date: Sat Sep 18 18:32:13 2010 +0200

src/Makefile.am: remove duplicate filenames from the list.

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d1c29cf37d2f2... Author: Marco Poletti poletti.marco@gmail.com Date: Sat Sep 18 17:15:13 2010 +0200

Indentation fixes, mainly to avoid line wraps.

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b1b240cfb51fa... Author: Marco Poletti poletti.marco@gmail.com Date: Sat Sep 18 17:14:09 2010 +0200

Fix typo in comment.