[FM refactoring] perform fixed vertex check slightly deepter --> halv…

…e compilation time
kahypar · Sep 4, 2023 · 9b5fe74 · 9b5fe74
1 parent 5b9bcfb
commit 9b5fe74
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/mt-kahypar/partition/refinement/fm/localized_kway_fm_core.cpp b/mt-kahypar/partition/refinement/fm/localized_kway_fm_core.cpp
@@ -52,11 +52,7 @@ namespace mt_kahypar {
       deltaPhg.clear();
       deltaPhg.setPartitionedHypergraph(&phg);
       delta_gain_cache.clear();
-      if ( phg.hasFixedVertices() ) {
-        internalFindMoves<true>(phg, fm_strategy);
-      } else {
-        internalFindMoves<false>(phg, fm_strategy);
-      }
+      internalFindMoves(phg, fm_strategy);
       return true;
     } else {
       return false;
@@ -113,7 +109,7 @@ namespace mt_kahypar {
 
 
   template<typename TypeTraits, typename GainTypes>
-  template<bool has_fixed_vertices, typename DispatchedFMStrategy>
+  template<typename DispatchedFMStrategy>
   void LocalizedKWayFM<TypeTraits, GainTypes>::internalFindMoves(PartitionedHypergraph& phg,
                                                                  DispatchedFMStrategy& fm_strategy) {
     StopRule stopRule(phg.initialNumNodes());
@@ -203,7 +199,12 @@ namespace mt_kahypar {
           break;
         }
 
-        acquireOrUpdateNeighbors<has_fixed_vertices>(deltaPhg, delta_gain_cache, move, fm_strategy);
+        if (phg.hasFixedVertices()) {
+          acquireOrUpdateNeighbors<true>(deltaPhg, delta_gain_cache, move, fm_strategy);
+        } else {
+          acquireOrUpdateNeighbors<false>(deltaPhg, delta_gain_cache, move, fm_strategy);
+        }
+
       }
     }
 

diff --git a/mt-kahypar/partition/refinement/fm/localized_kway_fm_core.h b/mt-kahypar/partition/refinement/fm/localized_kway_fm_core.h
@@ -88,7 +88,7 @@ class LocalizedKWayFM {
   FMStats stats;
 
 private:
-  template<bool has_fixed_vertices, typename DispatchedFMStrategy>
+  template<typename DispatchedFMStrategy>
   void internalFindMoves(PartitionedHypergraph& phg, DispatchedFMStrategy& fm_strategy);
 
   template<bool has_fixed_vertices, typename PHG, typename CACHE, typename DispatchedFMStrategy>