Better check for link between rest and augmentation dot

Author: hbitteur

app/src/main/java/org/audiveris/omr/sig/inter/AugmentationDotInter.java

@@ -496,7 +496,10 @@ private Link lookupLink (List<Inter> systemRests,
     // lookupRestLinks //
     //-----------------//
     /**
-     * Look up for all possible links with rests
+     * Look up for all possible links with rests.
+     * <p>
+     * As opposed to a head or a dot, a rest can be rather high.
+     * Therefore, we have to adjust the ordinate tests.
      *
      * @param systemRests system rests, sorted by abscissa
      * @param system      containing system
@@ -524,14 +527,18 @@ public List<Link> lookupRestLinks (List<Inter> systemRests,
         final List<Inter> rests = dotStack.filter(
                 Inters.intersectedInters(systemRests, GeoOrder.BY_ABSCISSA, luBox));
         final int minDx = scale.toPixels(AugmentationRelation.getXOutGapMinimum(profile));
+        final double heightRatio = AugmentationRelation.getRestHeightRatio().getValue();
 
         for (Inter inter : rests) {
-            RestInter rest = (RestInter) inter;
-            Point refPt = rest.getCenterRight();
-            double xGap = dotCenter.x - refPt.x;
+            final RestInter rest = (RestInter) inter;
+            final int restHeight = rest.getBounds().height;
+            final double yMargin = restHeight * heightRatio;
+            final Point refPt = rest.getCenterRight();
+            final double xGap = dotCenter.x - refPt.x;
 
             if (xGap >= minDx) {
                 double yGap = Math.abs(refPt.y - dotCenter.y);
+                yGap = Math.max(0, yGap - yMargin);
                 AugmentationRelation rel = new AugmentationRelation();
                 rel.setOutGaps(scale.pixelsToFrac(xGap), scale.pixelsToFrac(yGap), profile);
 

app/src/main/java/org/audiveris/omr/sig/relation/AugmentationRelation.java

@@ -59,7 +59,7 @@ public class AugmentationRelation
 
     private static final Logger logger = LoggerFactory.getLogger(AugmentationRelation.class);
 
-    private static final double[] OUT_WEIGHTS = new double[]
+    private static final double[] OUT_WEIGHTS = new double[] //
     { constants.xOutWeight.getValue(), constants.yWeight.getValue() };
 
     //~ Methods ------------------------------------------------------------------------------------
@@ -200,6 +200,14 @@ public static Scale.Fraction getYGapMaximum (int profile)
         return (Scale.Fraction) constants.getConstant(constants.yGapMax, profile);
     }
 
+    //--------------------//
+    // getRestHeightRatio //
+    //--------------------//
+    public static Constant.Ratio getRestHeightRatio ()
+    {
+        return constants.restHeightRatio;
+    }
+
     //~ Inner Classes ------------------------------------------------------------------------------
 
     //-----------//
@@ -240,5 +248,9 @@ private static class Constants
         private final Constant.Ratio yWeight = new Constant.Ratio(
                 1,
                 "Relative impact weight for yGap");
+
+        private final Constant.Ratio restHeightRatio = new Constant.Ratio(
+                0.45,
+                "Height margin ratio given to a rest");
     }
 }