Merge pull request #15 from upb-lea/develop

Fix voltage limit issue and some refactoring

Author: gituser789

.github/workflows/main.yml

@@ -39,6 +39,7 @@ jobs:
           
             pip install types-requests
             pip install mypy
+            pip install scipy-stubs pandas-stubs 
             mypy $(git ls-files '*.py') 
       - name: Install packages for spell check and perform spell check
         run: |

.gitignore

@@ -23,5 +23,6 @@ dist/
 gpgit/
 trial/
 trial.py
-foil_downloads/
-ceramic_downloads/
+film_downloads/
+ceramic_downloads/
+results_*.csv

CHANGELOG.md

@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.1.0] - 2025-11-05
 ### Added
- - Initial release featuring foil capacitor selection for power electronics applications 
+ - Initial release featuring film capacitor selection for power electronics applications 
 
 [unreleased]: https://github.com/upb-lea/capacitor_selection_toolbox/compare/0.1.1...HEAD
 [0.1.1]: https://github.com/upb-lea/capacitor_selection_toolbox/compare/0.1.0...0.1.1

README.rst

@@ -2,7 +2,7 @@
 
 Power Electronics Capacitor Selection Toolbox (PE-CST)
 =========================================================================
-Toolbox to select suitable foil capacitors for power electronics applications.
+Toolbox to select suitable film capacitors for power electronics applications.
 
 
 Installation

examples/foil_capacitor_comparison.py examples/film_capacitor_comparison.pyexamples/foil_capacitor_comparison.py renamed to examples/film_capacitor_comparison.py

@@ -5,7 +5,7 @@
 
 # 3rd party libraries
 import numpy as np
-from matplotlib import pyplot as plt
+from matplotlib import pyplot as plt  # type: ignore
 
 # own libraries
 import pecst
@@ -32,7 +32,7 @@
 )
 
 # capacitor pareto plane calculation
-c_name_list, c_db_list = pecst.foil.select_foil_capacitors(capacitor_requirements)
+c_name_list, c_db_list = pecst.film.select_film_capacitors(capacitor_requirements)
 c_name_list[1] = c_name_list[1].replace("B3272*AGT", "B3272*A/G/T")
 color_list = [pecst.gnome_colors["black"], pecst.gnome_colors["red"], pecst.gnome_colors["blue"]]
 

examples/foil_download_esr_files.py examples/film_download_esr_files.pyexamples/foil_download_esr_files.py renamed to examples/film_download_esr_files.py

@@ -8,4 +8,4 @@
 # configure logging to show femmt terminal output
 logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.INFO)
 
-pecst.foil.download_esr_csv_files()
+pecst.film.download_esr_csv_files()

examples/technology_comparison.py

@@ -5,7 +5,7 @@
 
 # 3rd party libraries
 import numpy as np
-from matplotlib import pyplot as plt
+from matplotlib import pyplot as plt  # type: ignore
 
 # own libraries
 import pecst

pecst/__init__.py

@@ -11,6 +11,6 @@
 from pecst.selection import select_capacitors as select_capacitors
 
 # capacitor specific types
-from pecst.foil import *
+from pecst.film import *
 from pecst.ceramic import *
 from pecst.electrolytic import *

pecst/ceramic/selection.py

@@ -7,7 +7,7 @@
 # 3rd party libraries
 import numpy as np
 import pandas as pd
-from matplotlib import pyplot as plt
+from matplotlib import pyplot as plt  # type: ignore
 
 # own libraries
 from pecst.cst_dataclasses import CapacitorRequirements
@@ -112,7 +112,7 @@ def select_ceramic_capacitors(c_requirements: CapacitorRequirements) -> tuple[li
 
     # sort out all capacitors where to many series capacitors are required (more than maximum in series allowed)
     ceramic_df["number_min_capacitors_in_series"] = np.ceil(
-        c_requirements.v_dc_for_op_max_voltage / (ceramic_df["voltage"] * (1 + c_requirements.voltage_safety_margin_percentage / 100)))
+        c_requirements.v_dc_for_op_max_voltage / (ceramic_df["voltage"] * (1 - c_requirements.voltage_safety_margin_percentage / 100)))
     logger.info(f"Initial ceramic dataframe shape: {ceramic_df.shape}")
     ceramic_df = ceramic_df.drop(ceramic_df[ceramic_df["number_min_capacitors_in_series"] > c_requirements.maximum_number_series_capacitors].index)
     logger.info(f"Ceramic dataframe shape after dropping number_min_capacitors_in_series > maximum_number_series_capacitors: {ceramic_df.shape}")
@@ -129,7 +129,7 @@ def select_ceramic_capacitors(c_requirements: CapacitorRequirements) -> tuple[li
                 x["ordering code"], x["capacitance"], v_dc_max, x["number_min_capacitors_in_series"], n_max_c, c_min_req), axis=1)
 
         # drop capacitors with no bias curve data given
-        # leads to drop all values ... but works with the foil capacitors
+        # leads to drop all values ... but works with the film capacitors
         # ceramic_df = ceramic_df.drop(ceramic_df[np.isnan(ceramic_df["in_series_needed"])].index)
         logger.info(f"Ceramic dataframe shape after dropping NaNs with in_series_needed: {ceramic_df.shape}")
         # loss calculation per capacitor

pecst/constants.py

@@ -31,15 +31,16 @@
 TEMPERATURE_125 = 125
 
 # folder names
-FOIL_CAPACITOR_ESR_OVER_FREQUENCY_DIRECTORY = "foil_downloads"
-FOIL_CAPACITOR_DATA_DIRECTORY = "foil_capacitor_data"
+FILM_CAPACITOR_ESR_OVER_FREQUENCY_DIRECTORY = "film_downloads"
+FILM_CAPACITOR_DATA_DIRECTORY = "film_capacitor_data"
 ELECTROLYTIC_CAPACITOR_DATA_DIRECTORY = "electrolytic_capacitor_data"
 ELECTROLYTIC_CAPACITOR_DOWNLOAD_DIRECTORY = "electrolytic_downloads"
 CERAMIC_CAPACITOR_DOWNLOAD_DIRECTORY = "ceramic_downloads"
 
-# foil capacitor settings
-FOIL_CAPACITOR_SERIES_NAME_LIST = ["B3271*P", "B3272*AGT", "B3277*P"]
-FOIL_CAPACITOR_SERIES_VALUES = "series_values"
+# film capacitor settings
+FILM_CAPACITOR_SERIES_NAME_LIST = ["B3271*P", "B3272*AGT", "B3277*P"]
+FILM_CAPACITOR_SERIES_VALUES = "series_values"
+FILM_CAPACITOR_RESONANCE_FREQUENCY_FACTOR = 1
 
 # electrolytic capacitor settings
 ELECTROLYTIC_CAPACITOR_SERIES_NAME_LIST = ["056057psmsi", "058059pllsi"]
@@ -80,3 +81,7 @@
                                     "M": 0.2}
 
 MATERIAL_KEMET_DICT = {"G": "C0G"}
+
+
+# resistor
+E12_BASIC_LIST = [1, 1.2, 1.5, 1.8, 2.2, 2.7, 3.3, 3.9, 4.7, 5.6, 6.8, 8.2]