@@ -45,8 +45,8 @@ namespace mt_kahypar {
4545 timer.start_timer (" preprocessing" , " Preprocessing" );
4646 DegreeZeroHypernodeRemover<TypeTraits> degree_zero_hn_remover (context);
4747 LargeHyperedgeRemover<TypeTraits> large_he_remover (context);
48- preprocess (hypergraph, context, target_graph);
49- // sanitize(hypergraph, context, degree_zero_hn_remover, large_he_remover);
48+ Partitioner<TypeTraits>:: preprocess (hypergraph, context, target_graph);
49+ EvoPartitioner<TypeTraits>:: sanitize (hypergraph, context, degree_zero_hn_remover, large_he_remover);
5050 timer.stop_timer (" preprocessing" );
5151
5252 // ################## EVOLUTIONARY PARTITIONING ##################
@@ -96,6 +96,7 @@ namespace mt_kahypar {
9696 timer.start_timer (" postprocessing" , " Postprocessing" );
9797 large_he_remover.restoreLargeHyperedges (final_partition);
9898 degree_zero_hn_remover.restoreDegreeZeroHypernodes (final_partition);
99+ // forceFixedVertexAssignment(partitioned_hypergraph, context);
99100 timer.stop_timer (" postprocessing" );
100101
101102 #ifdef KAHYPAR_ENABLE_STEINER_TREE_METRIC
@@ -104,7 +105,7 @@ namespace mt_kahypar {
104105 context.partition .objective = Objective::steiner_tree;
105106 timer.start_timer (" one_to_one_mapping" , " One-To-One Mapping" );
106107 InitialMapping<TypeTraits>::mapToTargetGraph (
107- final_partition, *target_graph, context);
108+ final_partition, *target_graph, context);
108109 timer.stop_timer (" one_to_one_mapping" );
109110 }
110111 #endif
@@ -151,6 +152,7 @@ namespace mt_kahypar {
151152 LOG << " DEBUG: Initial population target size =" << context.evolutionary .population_size ;
152153 int best = std::numeric_limits<HyperedgeWeight>::max ();
153154 int iteration = 0 ;
155+
154156 while (population.size () < context.evolutionary .population_size &&
155157 time_elapsed <= duration) {
156158 LOG << " DEBUG: Initial pop loop - Iteration" << iteration << " , Pop size:" << population.size ();
@@ -463,8 +465,6 @@ namespace mt_kahypar {
463465 context.evolutionary .iteration += total_iterations.load ();
464466 context.partition .verbose_output = true ;
465467 LOG << " Performed " << total_iterations.load () << " Evolutionary Iterations" << " \n " ;
466- LOG << " " << (total_iterations.load () - total_mutations.load () - total_combinations.load ())
467- << " Initial Population members" << " \n " ;
468468 LOG << " " << total_mutations.load () << " Mutations" << " \n " ;
469469 LOG << " " << total_combinations.load () << " Combinations" << " \n " ;
470470
0 commit comments