Merge branch 'fix_correlated_field' into 'NIFTy_6'

CorrelatedField: fix for `total_N > 1`

See merge request !489

nifty6/library/correlated_fields.py

@@ -38,6 +38,7 @@ from ..operators.operator import Operator
 from ..operators.simple_linear_operators import ducktape
 from ..probing import StatCalculator
 from ..sugar import full, makeDomain, makeField, makeOp
+from .. import utilities
 
 
 def _reshaper(x, N):
@@ -255,7 +256,7 @@ class _Distributor(LinearOperator):
             res = x[self._dofdex]
         else:
             res = np.zeros(self._tgt(mode).shape, dtype=x.dtype)
-            res[self._dofdex] = x
+            res = utilities.special_add_at(res, 0, self._dofdex, x)
         return makeField(self._tgt(mode), res)
 
 

test/test_operators/test_correlated_fields.py

@@ -32,8 +32,26 @@ def _stats(op, samples):
     return sc.mean.val, sc.var.ptw("sqrt").val
 
 
-@pmp('sspace', [ift.RGSpace(4), ift.RGSpace((4, 4), (0.123, 0.4)),
-                ift.HPSpace(8), ift.GLSpace(4)])
+@pmp('dofdex', [[0, 0], [0, 1]])
+@pmp('seed', [12, 3])
+def testDistributor(dofdex, seed):
+    with ift.random.Context(seed):
+        dom = ift.RGSpace(3)
+        N_copies = max(dofdex) + 1
+        distributed_target = ift.makeDomain(
+            (ift.UnstructuredDomain(len(dofdex)), dom))
+        target = ift.makeDomain((ift.UnstructuredDomain(N_copies), dom))
+        op = ift.library.correlated_fields._Distributor(
+            dofdex, target, distributed_target)
+        ift.extra.consistency_check(op)
+
+
+@pmp('sspace', [
+    ift.RGSpace(4),
+    ift.RGSpace((4, 4), (0.123, 0.4)),
+    ift.HPSpace(8),
+    ift.GLSpace(4)
+])
 @pmp('N', [0, 2])
 def testAmplitudesInvariants(sspace, N):
     fsspace = ift.RGSpace((12,), (0.4,))
@@ -89,12 +107,10 @@ def testAmplitudesInvariants(sspace, N):
     assert_(op.target[-2] == sspace)
     assert_(op.target[-1] == fsspace)
 
-    # FIXME
-    if N > 1:
-        return
-
     for ampl in fa.normalized_amplitudes:
-        ift.extra.check_jacobian_consistency(ampl, ift.from_random(ampl.domain),
+        ift.extra.check_jacobian_consistency(ampl,
+                                             ift.from_random(ampl.domain),
                                              ntries=10)
-    ift.extra.check_jacobian_consistency(op, ift.from_random(op.domain),
+    ift.extra.check_jacobian_consistency(op,
+                                         ift.from_random(op.domain),
                                          ntries=10)