Merge remote-tracking branch 'BRML/master'

.travis.yml

 language: python
+sudo: false
 python:
   - "2.7"
+addons:
+  apt:
+    packages:
+    - libblas-dev
+    - liblapack-dev
+    - gfortran
+    - libatlas3gf-base
 before_install:
-  - sudo apt-get install -qq libatlas3gf-base libatlas-dev liblapack-dev gfortran
+  - pip install -U pip
 install:
-  - "pip install -q numpy==1.5 --use-mirrors"
-  - "pip install -r requirements.txt --use-mirrors"
-script: nosetests
+  - travis_wait travis_retry pip install -r requirements.txt
+  - travis_retry pip install -e . 
+script: nosetests test
+cache:
+  - apt
+  - directories:
+    - $HOME/.cache/pip
+    - $HOME/.theano

climin/adadelta.py

@@ -107,7 +107,7 @@ class Adadelta(Minimizer):
             d = self.decay
             o = self.offset
             m = self.momentum
-            step1 = step_m1 * m * self.step_rate
+            step1 = step_m1 * m
             self.wrt -= step1
 
             gradient = self.fprime(self.wrt, *args, **kwargs)

test/test_rprop.py

@@ -20,10 +20,10 @@ def test_rprop_quadratic():
 
 def test_rprop_rosen():
     obj = Rosenbrock()
-    opt = Rprop(obj.pars, obj.fprime, step_shrink=0.1, step_grow=1.2,
-                min_step=1e-6, max_step=0.1)
+    opt = Rprop(obj.pars, obj.fprime, step_shrink=0.6, step_grow=1.2,
+                min_step=1e-8, max_step=1.)
     for i, info in enumerate(opt):
-        if i > 5000:
+        if i > 2000:
             break
     assert obj.solved(), 'did not find solution'
 
@@ -31,7 +31,7 @@ def test_rprop_rosen():
 def test_rprop_lr():
     obj = LogisticRegression()
     args = itertools.repeat(((obj.X, obj.Z), {}))
-    opt = Rprop(obj.pars, obj.fprime, step_shrink=0.1, step_grow=1.2,
+    opt = Rprop(obj.pars, obj.fprime, step_shrink=0.5, step_grow=1.2,
                 min_step=1e-6, max_step=0.1, args=args)
     for i, info in enumerate(opt):
         if i > 500: