Remove not yet needed class and corrected test

test was failing as rounding for multiple segmets has changed
pull/311/head
Holger Müller 2020-08-01 10:46:15 +02:00
rodzic 42fb34fb4b
commit 0d49b7e977
2 zmienionych plików z 2 dodań i 45 usunięć

Wyświetl plik

@ -80,49 +80,6 @@ class Datapoint(NamedTuple):
return impedance_to_inductance(self.impedance(ref_impedance), self.freq)
class DataSet():
def __init__(self, fields=("11", "21")):
self.fields = fields
self.data = {}
self.interp = []
self.inter_valid = False
self.lock = Lock()
def insert(self, datapoints: List['Datapoint']):
assert len(datapoints) == len(self.fields)
assert len(set([dp.freq for dp in datapoints])) == 1
frequency = datapoints[0].freq
self.data[frequency] = [dp.z for dp in datapoints]
self.inter_valid = False
def insert_complex(self, frequency: int, data: Tuple[complex]):
assert len(data) == len(self.fields)
self.data[frequency] = data
self.inter_valid = False
def items(self) -> Iterator[List['Datapoint']]:
for freq in sorted(self.data.keys()):
yield [Datapoint(freq, z.real, z.imag) for z in self.data[freq]]
def items_complex(self) -> Iterator[Tuple[int, List[complex]]]:
for freq in sorted(self.data.keys()):
yield (freq, self.data[freq])
def min_freq(self) -> int:
return min(self.data.keys())
def max_freq(self) -> int:
return max(self.data.keys())
def gen_interpolation(self):
self.interp = []
for i in range(self.fields):
d
def gamma_to_impedance(gamma: complex, ref_impedance: float = 50) -> complex:
"""Calculate impedance from gamma"""
try:

Wyświetl plik

@ -32,10 +32,10 @@ class TestCases(unittest.TestCase):
self.assertFalse(Sweep(3600001) == sweep)
self.assertRaises(ValueError, Sweep, -1)
sweep = Sweep(segments=3)
self.assertEqual(sweep.get_index_range(1), (12488000, 21288000))
self.assertEqual(sweep.get_index_range(1), (12429117, 21170817))
data = list(sweep.get_frequencies())
self.assertEqual(data[0], 3600000)
self.assertEqual(data[-1], 30088871)
self.assertEqual(data[-1], 29913383)
sweep = Sweep(segments=3, properties=Properties(logarithmic=True))
self.assertEqual(sweep.get_index_range(1), (9078495, 16800000))
data = list(sweep.get_frequencies())