Couple small cleanups.

Author: garretrieger

ift/encoder/candidate_merge.cc

@@ -258,17 +258,15 @@ StatusOr<double> CandidateMerge::ComputeCostDelta(
                               modified_conditions));
 
   double cost_delta = 0.0;
-  VLOG(1) << "cost delta for merge of " << merged_segments.ToString() << ":";
+  VLOG(1) << "cost_delta for merge of " << merged_segments.ToString()
+            << " =";
   if (!moving_to_init_font) {
     // Merge will introduce a new patch (merged_segment) with size
     // "new_patch_size", add the associated cost.
     double p = (*merged_segment)->Probability();
-    cost_delta += p * (new_patch_size + per_request_overhead);
-    VLOG(1) << "  cost_delta for merge of " << merged_segments.ToString()
-            << " =";
-
-    VLOG(1) << "    + (" << p << " * "
-            << (new_patch_size + per_request_overhead) << ") -> " << cost_delta
+    double s = new_patch_size + per_request_overhead;
+    cost_delta += p * s;
+    VLOG(1) << "    + (" << p << " * " << s << ") -> " << cost_delta
             << " [merged patch]";
   } else {
     // Otherwise the merged segments are being moved to the init font, compute
@@ -316,6 +314,10 @@ StatusOr<double> CandidateMerge::ComputeCostDelta(
       // the cost addition as usual.
       SegmentSet condition_segments = c.TriggeringSegments();
       condition_segments.subtract(merged_segments);
+      if (condition_segments.empty()) {
+        continue;
+      }
+
       ActivationCondition new_condition =
           ActivationCondition::and_segments(condition_segments, 0);
       double p = TRY(c.Probability(

ift/encoder/closure_glyph_segmenter.cc

@@ -664,6 +664,9 @@ Status ClosureGlyphSegmenter::MoveSegmentsToInitFont(
   do {
     // TODO(garretrieger): as an optimization probably want to avoid rechecking
     //   segments that have previously been assessed for move into init font.
+    //   alternatively should be able to modify this to not immediately apply
+    //   the move, but scan all options and collect the set of segments to move
+    //   then repeat analysis until no changes.
     // TODO(garretrieger): consider reworking this using gids instead of
     //  codepoints. That is specify init font def in terms of gids. That will
     //  more closely match the intention of merging a specific patch into the