pqopen-lib 0.7.2__tar.gz → 0.7.3__tar.gz

{pqopen_lib-0.7.2 → pqopen_lib-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pqopen-lib
-Version: 0.7.2
+Version: 0.7.3
 Summary: A power quality processing library for calculating parameters from waveform data
 Project-URL: Homepage, https://github.com/DaqOpen/pqopen-lib
 Project-URL: Issues, https://github.com/DaqOpen/pqopen-lib/issues

{pqopen_lib-0.7.2 → pqopen_lib-0.7.3}/pqopen/powersystem.py

@@ -493,13 +493,13 @@ class PowerSystem(object):
         if "w_pos" in self._calc_channels["multi_period"]["energy"]:
             prev_w_pos_value = self._calc_channels["multi_period"]["energy"]["w_pos"].last_sample_value
             energy = (stop_sidx - start_sidx)/self._samplerate/3600*p_sum if p_sum > 0 else 0.0 # Energy in Wh
-            self._calc_channels["multi_period"]["energy"]["w_pos"].put_data_single(stop_sidx, prev_w_pos_value + energy)
+            self._calc_channels["multi_period"]["energy"]["w_pos"].put_data_single(stop_sidx, prev_w_pos_value + float(energy))
         
         # Calculate Negative Energy
         if "w_neg" in self._calc_channels["multi_period"]["energy"]:
             prev_w_neg_value = self._calc_channels["multi_period"]["energy"]["w_neg"].last_sample_value
             energy = -(stop_sidx - start_sidx)/self._samplerate/3600*p_sum if p_sum < 0 else 0.0 # Energy in Wh
-            self._calc_channels["multi_period"]["energy"]["w_neg"].put_data_single(stop_sidx, prev_w_neg_value + energy)
+            self._calc_channels["multi_period"]["energy"]["w_neg"].put_data_single(stop_sidx, prev_w_neg_value + float(energy))
 
         # Calculate unbalance (3-phase)
         if "unbal_0" in self._calc_channels["multi_period"]["voltage"]:

{pqopen_lib-0.7.2 → pqopen_lib-0.7.3}/pyproject.toml

@@ -12,7 +12,7 @@ packages = ["pqopen"]
 
 [project]
 name = "pqopen-lib"
-version = "0.7.2"
+version = "0.7.3"
 dependencies = [
     "numpy",
     "daqopen-lib",

{pqopen_lib-0.7.2 → pqopen_lib-0.7.3}/test/powersystem-test.py

@@ -451,6 +451,37 @@ class TestPowerSystemCalculationThreePhase(unittest.TestCase):
         p_neg, sidx = self.power_system.output_channels["P_neg"].read_data_by_acq_sidx(0, u1_values.size)
         self.assertIsNone(np.testing.assert_allclose(p_neg, expected_p_neg, rtol=0.01))
 
+    def test_energy_calc_pos_highoffset(self):
+        t = np.linspace(0, 1, int(self.power_system._samplerate), endpoint=False)
+        u1_values = 1.0*np.sqrt(2)*np.sin(2*np.pi*50*t)
+        u2_values = 1.0*np.sqrt(2)*np.sin(2*np.pi*50*t - 120*np.pi/180)
+        u3_values = 1.0*np.sqrt(2)*np.sin(2*np.pi*50*t + 120*np.pi/180)
+        i1_values = 1.0*np.sqrt(2)*np.sin(2*np.pi*50*t)
+        i2_values = 1.0*np.sqrt(2)*np.sin(2*np.pi*50*t -120*np.pi/180) 
+        i3_values = 1.0*np.sqrt(2)*np.sin(2*np.pi*50*t+ 120*np.pi/180)
+
+        Path(SCRIPT_DIR+"/data_files/energy.json").write_text(json.dumps({"W_pos": 1_000_000.1, "W_neg": 10}))
+
+        expected_w_pos = np.array([1, 2, 3, 4])*3*0.2/3600 + 1_000_000.1
+        expected_w_neg = np.array([1, 2, 3, 4])*0.0/3600 + 10
+
+        self.power_system.enable_energy_channels(Path(SCRIPT_DIR+"/data_files/energy.json"))
+        self.u1_channel.put_data(u1_values)
+        self.u2_channel.put_data(u2_values)
+        self.u3_channel.put_data(u3_values)
+
+        self.i1_channel.put_data(i1_values)
+        self.i2_channel.put_data(i2_values)
+        self.i3_channel.put_data(i3_values)
+
+        self.power_system.process()
+
+        # Check Energy W_pos
+        w_pos, sidx = self.power_system.output_channels["W_pos"].read_data_by_acq_sidx(0, u1_values.size)
+        self.assertIsNone(np.testing.assert_array_almost_equal(w_pos, expected_w_pos))
+        w_neg, sidx = self.power_system.output_channels["W_neg"].read_data_by_acq_sidx(0, u1_values.size)
+        self.assertIsNone(np.testing.assert_array_almost_equal(w_neg, expected_w_neg))
+
 class TestPowerSystemNperSync(unittest.TestCase):
     def setUp(self):
         self.u_channel = AcqBuffer()