mpl: ignore fixed objects in boundary penalty computation

     and format

Signed-off-by: Arthur Koucher <[email protected]>

Author: AcKoucher

src/mpl/src/SACoreSoftMacro.cpp

@@ -416,12 +416,17 @@ void SACoreSoftMacro::calBoundaryPenalty()
     return;
   }
 
-  int tot_num_macros = 0;
+  int number_of_movable_macros = 0;
   for (const auto& macro_id : pos_seq_) {
-    tot_num_macros += macros_[macro_id].getNumMacro();
+    const SoftMacro& soft_macro = macros_[macro_id];
+    if (soft_macro.isFixed()) {
+      continue;
+    }
+
+    number_of_movable_macros += soft_macro.getNumMacro();
   }
 
-  if (tot_num_macros <= 0) {
+  if (number_of_movable_macros == 0) {
     return;
   }
 
@@ -430,23 +435,28 @@ void SACoreSoftMacro::calBoundaryPenalty()
   float x_dist_from_root = 0.0f, y_dist_from_root = 0.0f;
 
   for (const auto& macro_id : pos_seq_) {
-    if (macros_[macro_id].getNumMacro() > 0) {
-      global_lx = macros_[macro_id].getX() + outline_.xMin() - root_->getX();
-      global_ly = macros_[macro_id].getY() + outline_.yMin() - root_->getY();
-      global_ux = global_lx + macros_[macro_id].getWidth();
-      global_uy = global_ly + macros_[macro_id].getHeight();
+    const SoftMacro& soft_macro = macros_[macro_id];
+    if (soft_macro.isFixed()) {
+      continue;
+    }
+
+    if (soft_macro.getNumMacro() > 0) {
+      global_lx = soft_macro.getX() + outline_.xMin() - root_->getX();
+      global_ly = soft_macro.getY() + outline_.yMin() - root_->getY();
+      global_ux = global_lx + soft_macro.getWidth();
+      global_uy = global_ly + soft_macro.getHeight();
 
       x_dist_from_root
           = std::min(global_lx, std::abs(root_->getWidth() - global_ux));
       y_dist_from_root
           = std::min(global_ly, std::abs(root_->getHeight() - global_uy));
 
       boundary_penalty_ += std::min(x_dist_from_root, y_dist_from_root)
-                           * macros_[macro_id].getNumMacro();
+                           * soft_macro.getNumMacro();
     }
   }
   // normalization
-  boundary_penalty_ = boundary_penalty_ / tot_num_macros;
+  boundary_penalty_ = boundary_penalty_ / number_of_movable_macros;
   if (graphics_) {
     graphics_->setBoundaryPenalty({"Boundary",
                                    boundary_weight_,

src/mpl/src/SimulatedAnnealingCore.cpp

@@ -772,7 +772,7 @@ template <class T>
 bool SimulatedAnnealingCore<T>::resultFitsInOutline() const
 {
   return (width_ <= std::ceil(outline_.getWidth()))
-          && (height_ <= std::ceil(outline_.getHeight()));
+         && (height_ <= std::ceil(outline_.getHeight()));
 }
 
 template <class T>