Merge pull request #145 from upb-lea/ito

update scipy dependency, update integration tests

Author: gituser789

femmt/functions.py

@@ -7,7 +7,7 @@
 import os
 import warnings
 from typing import Union, List, Tuple, Dict
-from scipy.integrate import quadrature
+from scipy.integrate import quad
 
 
 # Third parry libraries
@@ -1673,7 +1673,7 @@ def visualize_inductance_matrix(inductance_matrix: np.array, silent: bool) -> No
 
 def calculate_quadrature_integral(time_steps: List[float], data: List[float]) -> float:
     """
-    Calculate the integral of given data over specific time steps using the quadrature method.
+    Calculate the integral of given data over specific time steps using the quad method.
 
     :param time_steps: List of time steps.
     :type time_steps: List[float]
@@ -1683,11 +1683,11 @@ def calculate_quadrature_integral(time_steps: List[float], data: List[float]) ->
     :rtype: float
     """
     func = lambda x: np.interp(x, time_steps, data)
-    return quadrature(func, time_steps[0], time_steps[-1])[0]
+    return quad(func, time_steps[0], time_steps[-1])[0]
 
 def calculate_squared_quadrature_integral(time_steps: List[float], data: List[float]) -> float:
     """
-    Calculate the integral of squared given data over specific time steps using the quadrature method..
+    Calculate the integral of squared given data over specific time steps using the quad method..
 
     :param time_steps: List of time steps.
     :type time_steps: List[float]
@@ -1697,7 +1697,7 @@ def calculate_squared_quadrature_integral(time_steps: List[float], data: List[fl
     :rtype: float
     """
     func = lambda x: np.interp(x, time_steps, data) ** 2
-    return quadrature(func, time_steps[0], time_steps[-1])[0]
+    return quad(func, time_steps[0], time_steps[-1])[0]
 
 def calculate_average(integral: float, time_steps: List[float]) -> float:
     """

setup.py

@@ -36,12 +36,12 @@
         'Environment :: MacOS X'
     ],
     description="FEM Magnetics Toolbox",
-    install_requires=['pandas~=2.2.1',
-                      'numpy~=1.26.0',
-                      'matplotlib~=3.8.0',
+    install_requires=['pandas',
+                      'numpy',
+                      'matplotlib',
                       'gmsh>=4.13.1',
                       'onelab>=1.0',
-                      'scipy~=1.12.0',
+                      'scipy',
                       'pytest',
                       'pycodestyle',
                       'PyQt5>=5.15.6',

tests/integration/fixtures/inductor_time_domain.json

@@ -13,10 +13,10 @@
           "winding1": {
             "number_turns": 7,
             "flux": [
-              6.597457099254291e-21
+              6.597457099229695e-21
             ],
             "V": [
-              7.125757217255167e-15
+              7.125757217228565e-15
             ],
             "I": 4.5
           }
@@ -29,10 +29,10 @@
           "winding1": {
             "number_turns": 7,
             "flux": [
-              -0.0001077446510103608
+              -0.0001077446510099585
             ],
             "V": [
-              -116.3724466877538
+              -116.372446687319
             ],
             "I": 2.755455298081545e-16
           }
@@ -45,10 +45,10 @@
           "winding1": {
             "number_turns": 7,
             "flux": [
-              -2.17295736405006e-07
+              -2.172957356635589e-07
             ],
             "V": [
-              116.1295014221795
+              116.1295014225463
             ],
             "I": -4.5
           }
@@ -61,10 +61,10 @@
           "winding1": {
             "number_turns": 7,
             "flux": [
-              0.0001076531837167653
+              0.0001076531837163754
             ],
             "V": [
-              116.5083098798428
+              116.5083098786209
             ],
             "I": -8.266365894244633e-16
           }
@@ -77,10 +77,10 @@
           "winding1": {
             "number_turns": 7,
             "flux": [
-              0.0002156350894730235
+              0.0002156350894741519
             ],
             "V": [
-              116.6369215864199
+              116.6369215880606
             ],
             "I": 4.5
           }
@@ -90,54 +90,54 @@
   ],
   "average_losses": {
     "core_eddy_losses": [
-      0.3741369333406631
+      0.37011728617857176
     ],
     "core_hyst_losses": [
       0
     ],
     "core_parts": {
       "core_part_1": {
-        "total_core_part_1": 0.3741369333406631
+        "total_core_part_1": 0.37011728617857176
       }
     },
     "winding1": {
-      "winding_losses": 0.6900431923699826,
+      "winding_losses": 0.6889948519566834,
       "turn_losses": [
-        0.02062169918780006,
-        0.0640740246767881,
-        0.1358084753404246,
-        0.19008381621056092,
-        0.1777720510658816,
-        0.06950271753711698,
-        0.024907924591631932
+        0.021618938051441074,
+        0.06330126872171397,
+        0.1348807882156743,
+        0.19195353829081477,
+        0.17952718687163013,
+        0.07162441266156501,
+        0.02612954650549344
       ],
       "flux_over_current": [
-        1.6640773590451344e-05
+        2.70273967261006e-05
       ],
       "average_current": [
         0.8999999999999998
       ],
       "average_voltage": [
-        43.563213887152386
+        43.64595635196963
       ],
-      "P": 39.20689249843714,
-      "S": 246.73612005242165,
-      "Q": 243.60117511855114
+      "P": 39.28136071677266,
+      "S": 246.94791520712943,
+      "Q": 243.8037069557934
     }
   },
   "total_losses": {
-    "all_windings_losses": 0.6900431923699826,
-    "eddy_core": 0.3741369333406631,
+    "all_windings_losses": 0.6889948519566834,
+    "eddy_core": 0.37011728617857176,
     "hyst_core_fundamental_freq": 0,
-    "core": 0.3741369333406631,
-    "total_core_part_1": 0.3741369333406631,
-    "total_losses": 1.0641801257106458
+    "core": 0.37011728617857176,
+    "total_core_part_1": 0.37011728617857176,
+    "total_losses": 1.059112138135255
   },
   "simulation_settings": {
     "simulation_name": null,
-    "date": "2024-01-13 00:27:49",
+    "date": "2025-02-24 12:49:53",
     "component_type": "Inductor",
-    "working_directory": "C:\\Users\\uthmn\\PycharmProjects\\FEM_Magnetics_Toolbox\\femmt\\examples\\example_results\\inductor",
+    "working_directory": "/home/nikolasf/Dokumente/01_git/30_Python/FEMMT/tests/integration/temp",
     "core": {
       "core_type": 1,
       "core_inner_diameter": 0.0149,
@@ -242,4 +242,4 @@
     ],
     "total_cost_incl_margin": 5.281563525657976
   }
-}
+}