Fixed compiler warnings; fixed travis

.travis.yml

@@ -4,7 +4,6 @@ matrix:
   - python: 2.6
     env:
     - SCIPYSPEC===0.12.0
-    - COVERALL=-coverage
   - python: 2.7
     env:
     - SCIPYSPEC===0.12.0
@@ -26,16 +25,15 @@ before_install:
 - if [ -n "${NUMPYSPEC}" ]; then pip install --upgrade pip setuptools; fi
 - if [ -n "${NUMPYSPEC}" ]; then pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel numpy$NUMPYSPEC; fi
 - pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel scipy$SCIPYSPEC matplotlib==1.3.0 sphinx nose==1.3.0 jinja2==2.6
-- if [ -n "${COVERALL}" ]; then pip install cpp-coveralls; fi
+- pip install cpp-coveralls
 install:
 - python bootstrap.py
-- CFLAGS=${COVERALL} ./bin/buildout
+- CFLAGS=-coverage ./bin/buildout
 script:
 - ./bin/python -c 'from bob.learn.boosting import get_config; print(get_config())'
-- if [ -n "${COVERALL}" ]; then ./bin/coverage run --source=bob.learn.boosting ./bin/nosetests -sv;
-  else ./bin/nosetests -sv; fi
+- ./bin/coverage run --source=bob.learn.boosting ./bin/nosetests -sv
 - ./bin/sphinx-build -b doctest doc sphinx
 - ./bin/sphinx-build -b html doc sphinx
 after_success:
-- if [ -n "${COVERALL}" ]; then coveralls --build-root=`pwd` --exclude=src --exclude=/usr --exclude-pattern="Compiler*"; fi
+- coveralls --build-root=`pwd` --exclude=src --exclude=/usr --exclude-pattern=".*Compiler.*"
 - ./src/bob.extension/scripts/upload-sphinx.sh

README.rst

-========================================================================================
-Generalized Boosting Framework using Stump and Look Up Table (LUT) based Weak Classifier
-========================================================================================
+.. vim: set fileencoding=utf-8 :
+.. Manuel Guenther <manuel.guenther@idiap.ch>
+.. Thu Sep  4 10:53:22 CEST 2014
+
+.. image:: https://travis-ci.org/bioidiap/bob.learn.boosting.svg?branch=master
+   :target: https://travis-ci.org/bioidiap/bob.learn.boosting
+.. image:: http://img.shields.io/badge/docs-latest-orange.png
+   :target: https://www.idiap.ch/software/bob/docs/latest/bioidiap/bob.learn.boosting/master/index.html
+.. image:: https://coveralls.io/repos/bioidiap/bob.learn.boosting/badge.png
+   :target: https://coveralls.io/r/bioidiap/bob.learn.boosting
+.. image:: http://img.shields.io/github/tag/bioidiap/bob.learn.boosting.png
+   :target: https://github.com/bioidiap/bob.learn.boosting
+.. image:: http://img.shields.io/pypi/v/bob.learn.boosting.png
+   :target: https://pypi.python.org/pypi/bob.learn.boosting
+.. image:: http://img.shields.io/pypi/dm/bob.learn.boosting.png
+   :target: https://pypi.python.org/pypi/bob.learn.boosting
+
+==========================================================================================
+ Generalized Boosting Framework using Stump and Look Up Table (LUT) based Weak Classifier
+==========================================================================================
 
 The package implements a generalized boosting framework, which incorporates different boosting approaches.
 The Boosting algorithms implemented in this package are:

bob/learn/boosting/boosted_machine.cpp

@@ -338,7 +338,7 @@ static PyObject* boostedMachine_forward(
       _forward<2,2>(self, p_features, p_predictions, p_labels);
     else {
       boostedMachine_forward_doc.print_usage();
-      PyErr_Format(PyExc_TypeError, "The number of dimensions of %s (%ld) and %s (%ld) are not supported", kwlist[0], p_features->ndim, kwlist[1], p_predictions->ndim);
+      PyErr_Format(PyExc_TypeError, "The number of dimensions of %s (%d) and %s (%d) are not supported", kwlist[0], (int)p_features->ndim, kwlist[1], (int)p_predictions->ndim);
       return NULL;
     }
     Py_RETURN_NONE;

bob/learn/boosting/lut_machine.cpp

@@ -223,7 +223,7 @@ static PyObject* lutMachine_forward(
       _forward<2,2>(self, p_features, p_predictions);
     else{
       lutMachine_forward_doc.print_usage();
-      PyErr_Format(PyExc_TypeError, "The number of dimensions of %s (%ld) and %s (%ld) are not supported", kwlist[0], p_features->ndim, kwlist[1], p_predictions->ndim);
+      PyErr_Format(PyExc_TypeError, "The number of dimensions of %s (%d) and %s (%d) are not supported", kwlist[0], (int)p_features->ndim, kwlist[1], (int)p_predictions->ndim);
       return NULL;
     }
     Py_RETURN_NONE;