[core] error checking for eta.ada

Author: terhorst

smcpp/_smcpp.pyx

@@ -62,6 +62,7 @@ aca = np.ascontiguousarray
 cdef ParameterVector make_params(a, s, dlist) except *:
     cdef ParameterVector ret
     cdef vector[adouble] r
+    assert np.all(a > 0)
     assert len(a) > 0
     for aa in a:
         if not isinstance(aa, ADF):

smcpp/model.py

@@ -168,11 +168,16 @@ def __call__(self, x):
 
     def match(self, other_model):
         a = np.cumsum(self.s)
+        a0 = np.cumsum(other_model.s)
         def f(x):
             self[:] = x
-            return ((self(a).astype('float') - other_model(a).astype('float')) ** 2).sum()
-        res = scipy.optimize.minimize(f, self[:].astype('float'))
-        # logger.debug(res)
+            r1 = ((self(a).astype('float') - other_model(a).astype('float')) ** 2).sum()
+            r2 = ((self(a0).astype('float') - other_model(a0).astype('float')) ** 2).sum()
+            return r1 + r2
+        m = other_model[:].astype('float').min()
+        M = other_model[:].astype('float').max()
+        bounds = ((m, M),) * len(self[:])
+        res = scipy.optimize.minimize(f, self[:].astype('float'), bounds=bounds)
         self[:] = res.x
 
     def stepwise_values(self):