cleanup

BerkeleyHCI · Aug 24, 2024 · 8b7cd27 · 8b7cd27
1 parent 458b61e
commit 8b7cd27
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 29 deletions.
diff --git a/edg/parts/JlcBjt.py b/edg/parts/JlcBjt.py
@@ -48,6 +48,4 @@ def parse_row(row: PartsTableRow) -> Optional[Dict[PartsTableColumn, Any]]:
       new_cols.update(cls._parse_jlcpcb_common(row))
       return new_cols
 
-    return cls._jlc_table().map_new_columns(parse_row).sort_by(
-      lambda row: [row[cls.BASIC_PART_HEADER], FootprintAreaTable.area_of(row[cls.KICAD_FOOTPRINT]), row[cls.COST]]
-    )
+    return cls._jlc_table().map_new_columns(parse_row)
diff --git a/edg/parts/JlcCapacitor.py b/edg/parts/JlcCapacitor.py
@@ -102,8 +102,7 @@ def filter_minimum_size(row: PartsTableRow) -> Optional[Dict[PartsTableColumn, A
 
   @classmethod
   def _row_sort_by(cls, row: PartsTableRow) -> Any:
-    return [row[cls.PARALLEL_COUNT], row[cls.BASIC_PART_HEADER],
-            FootprintAreaTable.area_of(row[cls.KICAD_FOOTPRINT]), row[cls.COST]]
+    return [row[cls.PARALLEL_COUNT], super(JlcCapacitor, cls)._row_sort_by(row)]
 
   def _make_parallel_footprints(self, row: PartsTableRow) -> None:
     cap_model = JlcDummyCapacitor(set_lcsc_part=row[self.LCSC_PART_HEADER],

diff --git a/edg/parts/JlcCrystal.py b/edg/parts/JlcCrystal.py
@@ -52,6 +52,4 @@ def parse_row(row: PartsTableRow) -> Optional[Dict[PartsTableColumn, Any]]:
       new_cols.update(cls._parse_jlcpcb_common(row))
       return new_cols
 
-    return cls._jlc_table().map_new_columns(parse_row).sort_by(
-      lambda row: [row[cls.BASIC_PART_HEADER], FootprintAreaTable.area_of(row[cls.KICAD_FOOTPRINT]), row[cls.COST]]
-    )
+    return cls._jlc_table().map_new_columns(parse_row)
diff --git a/edg/parts/JlcDiode.py b/edg/parts/JlcDiode.py
@@ -72,9 +72,7 @@ def parse_row(row: PartsTableRow) -> Optional[Dict[PartsTableColumn, Any]]:
       new_cols.update(cls._parse_jlcpcb_common(row))
       return new_cols
 
-    return cls._jlc_table().map_new_columns(parse_row).sort_by(
-      lambda row: [row[cls.BASIC_PART_HEADER], FootprintAreaTable.area_of(row[cls.KICAD_FOOTPRINT]), row[cls.COST]]
-    )
+    return cls._jlc_table().map_new_columns(parse_row)
 
 
 class JlcZenerDiode(TableZenerDiode, JlcTableSelector, JlcBaseDiode):
@@ -110,6 +108,4 @@ def parse_row(row: PartsTableRow) -> Optional[Dict[PartsTableColumn, Any]]:
       new_cols.update(cls._parse_jlcpcb_common(row))
       return new_cols
 
-    return cls._jlc_table().map_new_columns(parse_row).sort_by(
-      lambda row: [row[cls.BASIC_PART_HEADER], row[cls.KICAD_FOOTPRINT], row[cls.COST]]
-    )
+    return cls._jlc_table().map_new_columns(parse_row)
diff --git a/edg/parts/JlcElectrolyticCapacitor.py b/edg/parts/JlcElectrolyticCapacitor.py
@@ -45,7 +45,3 @@ def parse_row(row: PartsTableRow) -> Optional[Dict[PartsTableColumn, Any]]:
       return new_cols
 
     return cls._jlc_table().map_new_columns(parse_row)
-
-  @classmethod
-  def _row_sort_by(cls, row: PartsTableRow) -> Any:
-    return [row[cls.BASIC_PART_HEADER], FootprintAreaTable.area_of(row[cls.KICAD_FOOTPRINT]), row[cls.COST]]
diff --git a/edg/parts/JlcFerriteBead.py b/edg/parts/JlcFerriteBead.py
@@ -50,7 +50,3 @@ def parse_row(row: PartsTableRow) -> Optional[Dict[PartsTableColumn, Any]]:
       return new_cols
 
     return cls._jlc_table().map_new_columns(parse_row)
-
-  @classmethod
-  def _row_sort_by(cls, row: PartsTableRow) -> Any:
-    return [row[cls.BASIC_PART_HEADER], FootprintAreaTable.area_of(row[cls.KICAD_FOOTPRINT]), row[cls.COST]]
diff --git a/edg/parts/JlcFet.py b/edg/parts/JlcFet.py
@@ -70,9 +70,7 @@ def parse_row(row: PartsTableRow) -> Optional[Dict[PartsTableColumn, Any]]:
       new_cols.update(cls._parse_jlcpcb_common(row))
       return new_cols
 
-    return cls._jlc_table().map_new_columns(parse_row).sort_by(
-      lambda row: [row[cls.BASIC_PART_HEADER], FootprintAreaTable.area_of(row[cls.KICAD_FOOTPRINT]), row[cls.COST]]
-    )
+    return cls._jlc_table().map_new_columns(parse_row)
 
 
 class JlcFet(JlcBaseFet, TableFet):

diff --git a/edg/parts/JlcOscillator.py b/edg/parts/JlcOscillator.py
@@ -84,7 +84,7 @@ def parse_row(row: PartsTableRow) -> Optional[Dict[PartsTableColumn, Any]]:
       new_cols.update(cls._parse_jlcpcb_common(row))
       return new_cols
 
-    return cls._jlc_table().map_new_columns(parse_row).sort_by(
+    return cls._jlc_table().map_new_columns(parse_row).sort_by(  # TODO dedup w/ JlcTableSelector._row_sort_by
       lambda row: [row[cls.BASIC_PART_HEADER], FootprintAreaTable.area_of(row[cls.KICAD_FOOTPRINT]), row[cls.COST]]
     )
 

diff --git a/edg/parts/JlcResistorArray.py b/edg/parts/JlcResistorArray.py
@@ -44,6 +44,4 @@ def parse_row(row: PartsTableRow) -> Optional[Dict[PartsTableColumn, Any]]:
       new_cols.update(cls._parse_jlcpcb_common(row))
       return new_cols
 
-    return cls._jlc_table().map_new_columns(parse_row).sort_by(
-      lambda row: [row[cls.BASIC_PART_HEADER], FootprintAreaTable.area_of(row[cls.KICAD_FOOTPRINT]), row[cls.COST]]
-    )
+    return cls._jlc_table().map_new_columns(parse_row)