QAM16 Maps angepasst

2 files changed, 10 insertions, 86 deletions

diff --git a/tests/Map/Map_test.py b/tests/Map/Map_test.py
index f7b478f..96a5b15 100755
--- a/tests/Map/Map_test.py
+++ b/tests/Map/Map_test.py
@@ -36,18 +36,14 @@ class Map_test(gr.top_block):
         self.v0 = v0 = -0.7071067811865475-0.7071067811865475j
         self.samp_rate = samp_rate = 32000
         self.const = const = digital.constellation_16qam().base()
-        self.a3 = a3 = -9.486832980505138-9.486832980505138j
-        self.a2 = a2 = 9.486832980505138-9.486832980505138j
-        self.a1 = a1 = -3.162277660168379-3.162277660168379j
-        self.a0 = a0 = 3.162277660168379-3.162277660168379j
 
         ##################################################
         # Blocks
         ##################################################
         self.epy_block_1 = epy_block_1.blk()
         self.digital_constellation_decoder_cb_0 = digital.constellation_decoder_cb(const)
-        self.blocks_vector_source_x_1_0 = blocks.vector_source_c([(-0.9486832980505138-0.31622776601683794j), (-0.9486832980505138-0.31622776601683794j)], True, 1, [])
-        self.blocks_repack_bits_bb_0 = blocks.repack_bits_bb(2, 8, "", False, gr.GR_MSB_FIRST)
+        self.blocks_vector_source_x_1_0 = blocks.vector_source_c([(-0.9486832980505138-0.9486832980505138j), (0.9486832980505138+0.9486832980505138j)], True, 1, [])
+        self.blocks_repack_bits_bb_0 = blocks.repack_bits_bb(4, 8, "", False, gr.GR_MSB_FIRST)
 
 
 
@@ -95,30 +91,6 @@ class Map_test(gr.top_block):
     def set_const(self, const):
         self.const = const
 
-    def get_a3(self):
-        return self.a3
-
-    def set_a3(self, a3):
-        self.a3 = a3
-
-    def get_a2(self):
-        return self.a2
-
-    def set_a2(self, a2):
-        self.a2 = a2
-
-    def get_a1(self):
-        return self.a1
-
-    def set_a1(self, a1):
-        self.a1 = a1
-
-    def get_a0(self):
-        return self.a0
-
-    def set_a0(self, a0):
-        self.a0 = a0
-
 
 
 
diff --git a/tests/Map/Map_tets.grc b/tests/Map/Map_tets.grc
index 1002b25..ffaa6e0 100644
--- a/tests/Map/Map_tets.grc
+++ b/tests/Map/Map_tets.grc
@@ -32,54 +32,6 @@ options:
     state: enabled
 
 blocks:
-- name: a0
-  id: variable
-  parameters:
-    comment: ''
-    value: 3.162277660168379-3.162277660168379j
-  states:
-    bus_sink: false
-    bus_source: false
-    bus_structure: null
-    coordinate: [552, 52.0]
-    rotation: 0
-    state: enabled
-- name: a1
-  id: variable
-  parameters:
-    comment: ''
-    value: -3.162277660168379-3.162277660168379j
-  states:
-    bus_sink: false
-    bus_source: false
-    bus_structure: null
-    coordinate: [552, 116.0]
-    rotation: 0
-    state: enabled
-- name: a2
-  id: variable
-  parameters:
-    comment: ''
-    value: 9.486832980505138-9.486832980505138j
-  states:
-    bus_sink: false
-    bus_source: false
-    bus_structure: null
-    coordinate: [552, 180.0]
-    rotation: 0
-    state: enabled
-- name: a3
-  id: variable
-  parameters:
-    comment: ''
-    value: -9.486832980505138-9.486832980505138j
-  states:
-    bus_sink: false
-    bus_source: false
-    bus_structure: null
-    coordinate: [552, 244.0]
-    rotation: 0
-    state: enabled
 - name: const
   id: variable_constellation
   parameters:
@@ -95,7 +47,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [264, 420.0]
+    coordinate: [984, 388.0]
     rotation: 0
     state: enabled
 - name: samp_rate
@@ -119,7 +71,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [712, 428.0]
+    coordinate: [712, 404.0]
     rotation: 0
     state: enabled
 - name: v1
@@ -131,7 +83,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [712, 492.0]
+    coordinate: [712, 468.0]
     rotation: 0
     state: enabled
 - name: v2
@@ -143,7 +95,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [712, 556.0]
+    coordinate: [712, 532.0]
     rotation: 0
     state: enabled
 - name: v3
@@ -155,7 +107,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [712, 620.0]
+    coordinate: [712, 596.0]
     rotation: 0
     state: enabled
 - name: blocks_repack_bits_bb_0
@@ -166,7 +118,7 @@ blocks:
     align_output: 'False'
     comment: ''
     endianness: gr.GR_MSB_FIRST
-    k: '2'
+    k: '4'
     l: '8'
     len_tag_key: '""'
     maxoutbuf: '0'
@@ -189,7 +141,7 @@ blocks:
     repeat: 'True'
     tags: '[]'
     type: complex
-    vector: '[(-0.9486832980505138-0.31622776601683794j), (-0.9486832980505138-0.31622776601683794j)]'
+    vector: '[(-0.9486832980505138-0.9486832980505138j), (0.9486832980505138+0.9486832980505138j)]'
     vlen: '1'
   states:
     bus_sink: false
@@ -253,7 +205,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1664, 336.0]
+    coordinate: [1632, 336.0]
     rotation: 0
     state: enabled
 - name: import_0