Commit bb1fae7b by Martin Reinecke

### fix merge problems and adjust tests

parent d6d234bd
 ... ... @@ -121,11 +121,6 @@ class RGSpace(Space): ndlist = tuple(ndlist) fixed_points = [] for index in np.ndindex(ndlist): for k in range(dimensions): if self.shape[k] % 2 != 0 and self.zerocenter[k]: index = list(index) index[k] = 1 index = tuple(index) fixed_points += [tuple(index * mid_index)] return fixed_points ... ... @@ -142,12 +137,8 @@ class RGSpace(Space): i = axes[k] slice_picker = slice_primitive[:] slice_inverter = slice_primitive[:] if (not self.zerocenter[k]) or self.shape[k] % 2 == 0: slice_picker[i] = slice(1, None, None) slice_inverter[i] = slice(None, 0, -1) else: slice_picker[i] = slice(None) slice_inverter[i] = slice(None, None, -1) slice_picker[i] = slice(1, None, None) slice_inverter[i] = slice(None, 0, -1) slice_picker = tuple(slice_picker) slice_inverter = tuple(slice_inverter) ... ...
 ... ... @@ -58,14 +58,12 @@ class Test_Interface(unittest.TestCase): class Test_Functionality(unittest.TestCase): @expand(product([True, False], [True, False], [True, False], [True, False], [(1,), (4,), (5,)], [(1,), (6,), (7,)])) def test_hermitian_decomposition(self, z1, z2, preserve, complexdata, s1, s2): def test_hermitian_decomposition(self, preserve, complexdata, s1, s2): np.random.seed(123) r1 = RGSpace(s1, harmonic=True, zerocenter=(z1,)) r2 = RGSpace(s2, harmonic=True, zerocenter=(z2,)) ra = RGSpace(s1+s2, harmonic=True, zerocenter=(z1, z2)) r1 = RGSpace(s1, harmonic=True) r2 = RGSpace(s2, harmonic=True) ra = RGSpace(s1+s2, harmonic=True) v = np.random.random(s1+s2) if complexdata: ... ... @@ -84,12 +82,9 @@ class Test_Functionality(unittest.TestCase): assert_almost_equal(h1.get_full_data(), h3.get_full_data()) assert_almost_equal(a1.get_full_data(), a3.get_full_data()) @expand(product([RGSpace((8,), harmonic=True, zerocenter=False), RGSpace((8, 8), harmonic=True, distances=0.123, zerocenter=True)], [RGSpace((8,), harmonic=True, zerocenter=False), @expand(product([RGSpace((8,), harmonic=True), RGSpace((8, 8), harmonic=True, distances=0.123)], [RGSpace((8,), harmonic=True), LMSpace(12)])) def test_power_synthesize_analyze(self, space1, space2): p1 = PowerSpace(space1) ... ...
 ... ... @@ -126,10 +126,9 @@ class RGSpaceFunctionalityTests(unittest.TestCase): assert_equal(getattr(x, key), value) @expand(product([(10,), (11,), (1, 1), (4, 4), (5, 7), (8, 12), (7, 16), (4, 6, 8), (17, 5, 3)], [True, False])) def test_hermitian_decomposition(self, shape, zerocenter): r = RGSpace(shape, harmonic=True, zerocenter=zerocenter) (4, 6, 8), (17, 5, 3)])) def test_hermitian_decomposition(self, shape): r = RGSpace(shape, harmonic=True) v = np.empty(shape, dtype=np.complex128) v.real = np.random.random(shape) v.imag = np.random.random(shape) ... ... @@ -147,20 +146,16 @@ class RGSpaceFunctionalityTests(unittest.TestCase): i1 = it.multi_index i2 = [] for i in range(len(i1)): if r.zerocenter[i] and r.shape[i] % 2 != 0: i2.append(h.shape[i]-i1[i]-1) else: i2.append(h.shape[i]-i1[i] if i1[i] > 0 else 0) i2.append(h.shape[i]-i1[i] if i1[i] > 0 else 0) i2 = tuple(i2) assert_almost_equal(h[i1], np.conj(h[i2])) assert_almost_equal(a[i1], -np.conj(a[i2])) it.iternext() @expand(product([(10,), (11,), (1, 1), (4, 4), (5, 7), (8, 12), (7, 16), (4, 6, 8), (17, 5, 3)], [True, False])) def test_hermitian_decomposition2(self, shape, zerocenter): r = RGSpace(shape, harmonic=True, zerocenter=zerocenter) (4, 6, 8), (17, 5, 3)])) def test_hermitian_decomposition2(self, shape): r = RGSpace(shape, harmonic=True) v = np.random.random(shape) h, a = r.hermitian_decomposition(v) # make sure that data == h + a ... ... @@ -171,10 +166,7 @@ class RGSpaceFunctionalityTests(unittest.TestCase): i1 = it.multi_index i2 = [] for i in range(len(i1)): if r.zerocenter[i] and r.shape[i] % 2 != 0: i2.append(h.shape[i]-i1[i]-1) else: i2.append(h.shape[i]-i1[i] if i1[i] > 0 else 0) i2.append(h.shape[i]-i1[i] if i1[i] > 0 else 0) i2 = tuple(i2) assert_almost_equal(h[i1], np.conj(h[i2])) assert_almost_equal(a[i1], -np.conj(a[i2])) ... ... @@ -195,6 +187,6 @@ class RGSpaceFunctionalityTests(unittest.TestCase): assert_(x is res) def test_hermitian_fixed_points(self): x = RGSpace((5, 6, 5, 6), zerocenter=[False, False, True, True]) x = RGSpace((5, 6, 5, 6)) assert_equal(x.hermitian_fixed_points(), [(0, 0, 2, 0), (0, 0, 2, 3), (0, 3, 2, 0), (0, 3, 2, 3)]) [(0, 0, 0, 0), (0, 0, 0, 3), (0, 3, 0, 0), (0, 3, 0, 3)])
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!