修改数据格式和双面板优化

opt/smm/feeder_priority.py

@@ -3,9 +3,9 @@ from opt.utils import *
 
 
 class FeederPriorityOpt(BaseOpt):
-    def __init__(self, config, part_data, step_data, feeder_data=pd.DataFrame(columns=['slot', 'part'])):
+    def __init__(self, config, part_data, step_data, feeder_data=pd.DataFrame(columns=['slot', 'part']), layer=1):
         super().__init__(config, part_data, step_data, feeder_data)
-
+        self.layer = layer
         self.e_gang_pick = 0.6
         self.e_nz_change = 4
 
@@ -28,6 +28,7 @@ class FeederPriorityOpt(BaseOpt):
             # 第3步：扫描供料器基座，确定元件拾取的先后顺序
             result = OptResult()
             result.part, result.cycle, result.slot = self.feeder_base_scan(feeder_data)
+            result.layer = [self.layer] * len(result.part)
             info = evaluation(self.config, self.part_data, self.step_data, result)
             val = self.cycle_weight * info.cycle_counter + self.nozzle_change_weight * info.nozzle_change_counter + \
                   self.pickup_weight * info.pickup_counter + self.move_weight * info.pickup_distance