merge: R OpenCL UMat

Aggiunge una view extra al matcher gia addestrato. Le varianti
della nuova view vengono APPENDATE a self.variants col tag view_idx
e partecipano al pruning/matching come le altre.

NCC verify usa il template della view che ha matchato (via
_get_view_template + parametro view_idx propagato a _verify_ncc).

Halcon-equivalent: create_aniso_shape_model con fusione N viste.
Use case: pezzo che cambia aspetto (chiaro/scuro, prima/dopo
trattamento, illuminazioni diverse) → un solo matcher robusto
invece di N matcher distinti.

API:
    m.train(template_chiaro)
    m.add_template_view(template_scuro)
    m.find(scene)  # match su entrambi gli aspetti

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

pm2d/line_matcher.py

@@ -150,6 +150,11 @@ class _Variant:
     kw: int
     cx_local: float   # centro-modello dentro al bbox kernel
     cy_local: float
+    # Indice template view (X feature - multi-template ensemble).
+    # 0 = template principale del train(); 1+ = view aggiunte via
+    # add_template_view(). Usato in _verify_ncc/_compute_recall per
+    # scegliere il template gray corretto per match.
+    view_idx: int = 0
 
 
 class LineShapeMatcher:
@@ -201,6 +206,11 @@ class LineShapeMatcher:
         self.template_gray: np.ndarray | None = None
         # Maschera usata in training (propagata al refine per coerenza).
         self._train_mask: np.ndarray | None = None
+        # Multi-template ensemble (X feature): N view dello stesso pezzo
+        # (chiari/scuri, condizioni diverse). Template principale e' [0],
+        # view aggiunte via add_template_view() sono [1+]. Match restituisce
+        # la view che ha matchato meglio.
+        self._view_templates: list[tuple[np.ndarray, np.ndarray | None]] = []
 
     # --- Helpers -------------------------------------------------------
 
@@ -262,6 +272,120 @@ class LineShapeMatcher:
                 np.array(picked_y, np.int32),
                 np.array(picked_b, np.int8))
 
+    # --- Save / Load (Halcon-style write_shape_model / read_shape_model)
+
+    def save_model(self, path: str) -> None:
+        """Salva matcher addestrato su disco (formato .npz).
+
+        Persiste: parametri, template_gray, mask, e tutte le varianti
+        pre-computate (con piramide). Halcon-equivalent write_shape_model.
+        Caso d'uso: training offline su workstation, deploy su macchina
+        di linea senza re-train (zero secondi di startup matching).
+        """
+        if not self.variants:
+            raise RuntimeError("Modello non addestrato: chiamare train() prima.")
+        # Flatten varianti in array piatti (npz non ama dataclass nested)
+        n_vars = len(self.variants)
+        n_levels = len(self.variants[0].levels)
+        var_meta = np.zeros((n_vars, 6), dtype=np.float32)  # ang, scale, kh, kw, cxl, cyl
+        all_dx, all_dy, all_bin, all_offsets = [], [], [], []
+        offset = 0
+        all_offsets_per_level = [[] for _ in range(n_levels)]
+        all_dx_per_level = [[] for _ in range(n_levels)]
+        all_dy_per_level = [[] for _ in range(n_levels)]
+        all_bin_per_level = [[] for _ in range(n_levels)]
+        for vi, var in enumerate(self.variants):
+            var_meta[vi] = (
+                var.angle_deg, var.scale, var.kh, var.kw,
+                var.cx_local, var.cy_local,
+            )
+            for li, lvl in enumerate(var.levels):
+                all_offsets_per_level[li].append(len(all_dx_per_level[li]))
+                all_dx_per_level[li].extend(lvl.dx.tolist())
+                all_dy_per_level[li].extend(lvl.dy.tolist())
+                all_bin_per_level[li].extend(lvl.bin.tolist())
+        for li in range(n_levels):
+            all_offsets_per_level[li].append(len(all_dx_per_level[li]))
+
+        out = {
+            "_format_version": np.array([1], dtype=np.int32),
+            "params": np.array([
+                self.num_features, self.weak_grad, self.strong_grad,
+                self.angle_range_deg[0], self.angle_range_deg[1],
+                self.angle_step_deg,
+                self.scale_range[0], self.scale_range[1], self.scale_step,
+                self.spread_radius, self.min_feature_spacing,
+                self.pyramid_levels, self.top_score_factor,
+                int(self.use_polarity),
+            ], dtype=np.float64),
+            "template_gray": self.template_gray,
+            "train_mask": self._train_mask,
+            "var_meta": var_meta,
+            "n_levels": np.array([n_levels], dtype=np.int32),
+        }
+        for li in range(n_levels):
+            out[f"dx_l{li}"] = np.asarray(all_dx_per_level[li], dtype=np.int32)
+            out[f"dy_l{li}"] = np.asarray(all_dy_per_level[li], dtype=np.int32)
+            out[f"bin_l{li}"] = np.asarray(all_bin_per_level[li], dtype=np.int8)
+            out[f"offsets_l{li}"] = np.asarray(all_offsets_per_level[li], dtype=np.int32)
+        np.savez_compressed(path, **out)
+
+    @classmethod
+    def load_model(cls, path: str) -> "LineShapeMatcher":
+        """Carica matcher pre-addestrato da .npz salvato con save_model.
+
+        Halcon-equivalent read_shape_model. Bypassa completamente train():
+        deploy production = istantaneo.
+        """
+        data = np.load(path, allow_pickle=False)
+        params = data["params"]
+        m = cls(
+            num_features=int(params[0]),
+            weak_grad=float(params[1]),
+            strong_grad=float(params[2]),
+            angle_range_deg=(float(params[3]), float(params[4])),
+            angle_step_deg=float(params[5]),
+            scale_range=(float(params[6]), float(params[7])),
+            scale_step=float(params[8]),
+            spread_radius=int(params[9]),
+            min_feature_spacing=int(params[10]),
+            pyramid_levels=int(params[11]),
+            top_score_factor=float(params[12]),
+            use_polarity=bool(int(params[13])),
+        )
+        tpl = data["template_gray"]
+        if tpl.ndim > 0 and tpl.size > 0:
+            m.template_gray = tpl
+            m.template_size = (tpl.shape[1], tpl.shape[0])
+        mk = data["train_mask"]
+        m._train_mask = mk if mk.size > 0 else None
+        var_meta = data["var_meta"]
+        n_levels = int(data["n_levels"][0])
+        offsets_l = [data[f"offsets_l{li}"] for li in range(n_levels)]
+        dx_l = [data[f"dx_l{li}"] for li in range(n_levels)]
+        dy_l = [data[f"dy_l{li}"] for li in range(n_levels)]
+        bin_l = [data[f"bin_l{li}"] for li in range(n_levels)]
+        m.variants = []
+        n_vars = var_meta.shape[0]
+        for vi in range(n_vars):
+            ang, scale, kh, kw, cxl, cyl = var_meta[vi]
+            levels = []
+            for li in range(n_levels):
+                i0 = int(offsets_l[li][vi])
+                i1 = int(offsets_l[li][vi + 1])
+                levels.append(_LevelFeatures(
+                    dx=dx_l[li][i0:i1].copy(),
+                    dy=dy_l[li][i0:i1].copy(),
+                    bin=bin_l[li][i0:i1].copy(),
+                    n=i1 - i0,
+                ))
+            m.variants.append(_Variant(
+                angle_deg=float(ang), scale=float(scale),
+                levels=levels, kh=int(kh), kw=int(kw),
+                cx_local=float(cxl), cy_local=float(cyl),
+            ))
+        return m
+
     def set_angle_range_around(
         self, center_deg: float, tolerance_deg: float,
     ) -> None:
@@ -350,8 +474,60 @@ class LineShapeMatcher:
         self._train_mask = mask_full.copy()
 
         self.variants.clear()
+        # Reset view list: template principale = view 0
+        self._view_templates = [(gray.copy(), mask_full.copy())]
         # Invalida cache feature di refine: il template e cambiato.
         self._refine_feat_cache = {}
+        self._build_variants_for_view(gray, mask_full, view_idx=0)
+        self._dedup_variants()
+        return len(self.variants)
+
+    def add_template_view(
+        self, template_bgr: np.ndarray, mask: np.ndarray | None = None,
+    ) -> int:
+        """Aggiunge una view template extra all'ensemble (Halcon-style
+        create_aniso_shape_model con fusione N viste).
+
+        Genera varianti del nuovo template con stessi parametri (range
+        angle/scale) e le APPENDE a self.variants. NCC/recall usano
+        automaticamente il template della view che ha matchato.
+
+        Use case: pezzo che cambia aspetto (chiaro/scuro, prima/dopo
+        trattamento, illuminazioni diverse) → un solo matcher resistente.
+
+        Ritorna numero TOTALE varianti dopo l'aggiunta. Le view sono
+        indicizzate da 1 in poi (0 e' il template del train).
+        """
+        if not self.variants:
+            raise RuntimeError(
+                "Chiamare train(template_principale) prima di add_template_view")
+        gray = self._to_gray(template_bgr)
+        h, w = gray.shape
+        if (w, h) != self.template_size:
+            # Resize per coerenza con bbox/poly
+            gray = cv2.resize(gray, self.template_size, interpolation=cv2.INTER_LINEAR)
+            if mask is not None:
+                mask = cv2.resize(mask, self.template_size, interpolation=cv2.INTER_NEAREST)
+        if mask is None:
+            mask_full = np.full(gray.shape, 255, dtype=np.uint8)
+        else:
+            mask_full = (mask > 0).astype(np.uint8) * 255
+        view_idx = len(self._view_templates)
+        self._view_templates.append((gray.copy(), mask_full.copy()))
+        n_before = len(self.variants)
+        self._build_variants_for_view(gray, mask_full, view_idx=view_idx)
+        self._dedup_variants()
+        return len(self.variants) - n_before
+
+    def _build_variants_for_view(
+        self, gray: np.ndarray, mask_full: np.ndarray, view_idx: int,
+    ) -> None:
+        """Estrae varianti rotate+scalate per UNA view template.
+
+        Estrazione algorithm identica al train() originale, separato per
+        riuso da add_template_view (multi-template ensemble).
+        """
+        h, w = gray.shape
         for s in self._scale_list():
             sw = max(16, int(round(w * s)))
             sh = max(16, int(round(h * s)))
@@ -405,9 +581,8 @@ class LineShapeMatcher:
                     levels=levels,
                     kh=kh, kw=kw,
                     cx_local=float(cx_local), cy_local=float(cy_local),
+                    view_idx=view_idx,
                 ))
-        self._dedup_variants()
-        return len(self.variants)
 
     def _dedup_variants(self) -> int:
         """Rimuove varianti con feature-set identico (post-quantizzazione).
@@ -786,9 +961,230 @@ class LineShapeMatcher:
                 s2, cx2, cy2 = _score_at_angle(x2)
         return best
 
+    def _get_view_template(
+        self, view_idx: int,
+    ) -> tuple[np.ndarray | None, np.ndarray | None]:
+        """Ritorna (template_gray, mask) per la view specificata.
+
+        view_idx 0 = template principale (train), 1+ = view extra
+        aggiunte via add_template_view. Usato per scegliere il template
+        corretto in NCC/recall verification quando il matcher e'
+        ensemble multi-template.
+        """
+        if 0 <= view_idx < len(self._view_templates):
+            return self._view_templates[view_idx]
+        return self.template_gray, self._train_mask
+
+    def _compute_recall(
+        self, spread0: np.ndarray, variant: _Variant,
+        cx: float, cy: float, angle_deg: float,
+    ) -> float:
+        """Frazione di feature template che combaciano nello spread scena
+        alla pose. Halcon-equivalent: MinScore originale.
+        """
+        if self.template_gray is None:
+            return 1.0
+        h, w = self.template_gray.shape
+        scale = variant.scale
+        sw = max(16, int(round(w * scale)))
+        sh = max(16, int(round(h * scale)))
+        gray_s = cv2.resize(self.template_gray, (sw, sh), interpolation=cv2.INTER_LINEAR)
+        mask_src = (
+            self._train_mask if self._train_mask is not None
+            else np.full_like(self.template_gray, 255)
+        )
+        mask_s = cv2.resize(mask_src, (sw, sh), interpolation=cv2.INTER_NEAREST)
+        diag = int(np.ceil(np.hypot(sh, sw))) + 6
+        py = (diag - sh) // 2; px = (diag - sw) // 2
+        gray_p = cv2.copyMakeBorder(
+            gray_s, py, diag - sh - py, px, diag - sw - px, cv2.BORDER_REPLICATE,
+        )
+        mask_p = cv2.copyMakeBorder(
+            mask_s, py, diag - sh - py, px, diag - sw - px,
+            cv2.BORDER_CONSTANT, value=0,
+        )
+        center = (diag / 2.0, diag / 2.0)
+        M = cv2.getRotationMatrix2D(center, angle_deg, 1.0)
+        gray_r = cv2.warpAffine(gray_p, M, (diag, diag),
+                                 flags=cv2.INTER_LINEAR,
+                                 borderMode=cv2.BORDER_REPLICATE)
+        mask_r = cv2.warpAffine(mask_p, M, (diag, diag),
+                                 flags=cv2.INTER_NEAREST, borderValue=0)
+        mag, bins = self._gradient(gray_r)
+        fx, fy, fb = self._extract_features(mag, bins, mask_r)
+        n_feat = len(fx)
+        if n_feat < 4:
+            return 0.0
+        H, W = spread0.shape
+        spread_dtype = spread0.dtype.type
+        ix = int(round(cx)); iy = int(round(cy))
+        hits = 0
+        for i in range(n_feat):
+            xs = ix + int(fx[i] - center[0])
+            ys = iy + int(fy[i] - center[1])
+            if 0 <= xs < W and 0 <= ys < H:
+                bit = spread_dtype(1 << int(fb[i]))
+                if spread0[ys, xs] & bit:
+                    hits += 1
+        return hits / n_feat
+
+    def _compute_soft_score(
+        self, scene_gray: np.ndarray, variant: _Variant,
+        cx: float, cy: float, angle_deg: float,
+    ) -> float:
+        """Soft-margin gradient similarity (Halcon Metric='use_polarity')."""
+        if self.template_gray is None:
+            return 0.0
+        h, w = self.template_gray.shape
+        scale = variant.scale
+        sw = max(16, int(round(w * scale)))
+        sh = max(16, int(round(h * scale)))
+        gray_s = cv2.resize(self.template_gray, (sw, sh), interpolation=cv2.INTER_LINEAR)
+        mask_src = (
+            self._train_mask if self._train_mask is not None
+            else np.full_like(self.template_gray, 255)
+        )
+        mask_s = cv2.resize(mask_src, (sw, sh), interpolation=cv2.INTER_NEAREST)
+        diag = int(np.ceil(np.hypot(sh, sw))) + 6
+        py = (diag - sh) // 2; px = (diag - sw) // 2
+        gray_p = cv2.copyMakeBorder(
+            gray_s, py, diag - sh - py, px, diag - sw - px, cv2.BORDER_REPLICATE,
+        )
+        mask_p = cv2.copyMakeBorder(
+            mask_s, py, diag - sh - py, px, diag - sw - px,
+            cv2.BORDER_CONSTANT, value=0,
+        )
+        center = (diag / 2.0, diag / 2.0)
+        M = cv2.getRotationMatrix2D(center, angle_deg, 1.0)
+        gray_r = cv2.warpAffine(gray_p, M, (diag, diag),
+                                 flags=cv2.INTER_LINEAR,
+                                 borderMode=cv2.BORDER_REPLICATE)
+        mask_r = cv2.warpAffine(mask_p, M, (diag, diag),
+                                 flags=cv2.INTER_NEAREST, borderValue=0)
+        gx_t = cv2.Sobel(gray_r, cv2.CV_32F, 1, 0, ksize=3)
+        gy_t = cv2.Sobel(gray_r, cv2.CV_32F, 0, 1, ksize=3)
+        mag_t = cv2.magnitude(gx_t, gy_t)
+        _, bins_t = self._gradient(gray_r)
+        fx, fy, _ = self._extract_features(mag_t, bins_t, mask_r)
+        if len(fx) < 4:
+            return 0.0
+        gx_s = cv2.Sobel(scene_gray, cv2.CV_32F, 1, 0, ksize=3)
+        gy_s = cv2.Sobel(scene_gray, cv2.CV_32F, 0, 1, ksize=3)
+        H, W = scene_gray.shape
+        ix = int(round(cx)); iy = int(round(cy))
+        sims = []; weights = []
+        for i in range(len(fx)):
+            xs = ix + int(fx[i] - center[0])
+            ys = iy + int(fy[i] - center[1])
+            if not (0 <= xs < W and 0 <= ys < H):
+                continue
+            tx = float(gx_t[int(fy[i]), int(fx[i])])
+            ty = float(gy_t[int(fy[i]), int(fx[i])])
+            sx = float(gx_s[ys, xs]); sy = float(gy_s[ys, xs])
+            tm = math.hypot(tx, ty); sm = math.hypot(sx, sy)
+            if tm < 1e-3 or sm < 1e-3:
+                continue
+            cos_sim = (tx * sx + ty * sy) / (tm * sm)
+            cos_sim = max(0.0, cos_sim) if self.use_polarity else abs(cos_sim)
+            sims.append(cos_sim); weights.append(min(sm, 255.0))
+        if not sims:
+            return 0.0
+        sims_arr = np.asarray(sims, dtype=np.float32)
+        w_arr = np.asarray(weights, dtype=np.float32)
+        return float((sims_arr * w_arr).sum() / (w_arr.sum() + 1e-9))
+
+    def _subpixel_refine_lm(
+        self, scene_gray: np.ndarray, variant: _Variant,
+        cx: float, cy: float, angle_deg: float,
+        n_iters: int = 2,
+    ) -> tuple[float, float]:
+        """Sub-pixel refinement iterativo via gradient-field least-squares.
+
+        Halcon-equivalent SubPixel='least_squares_high'. Precisione attesa
+        0.05 px (vs 0.5 px del fit quadratic 2D).
+        """
+        if self.template_gray is None:
+            return cx, cy
+        h, w = self.template_gray.shape
+        scale = variant.scale
+        sw = max(16, int(round(w * scale)))
+        sh = max(16, int(round(h * scale)))
+        gray_s = cv2.resize(self.template_gray, (sw, sh), interpolation=cv2.INTER_LINEAR)
+        mask_src = (
+            self._train_mask if self._train_mask is not None
+            else np.full_like(self.template_gray, 255)
+        )
+        mask_s = cv2.resize(mask_src, (sw, sh), interpolation=cv2.INTER_NEAREST)
+        diag = int(np.ceil(np.hypot(sh, sw))) + 6
+        py = (diag - sh) // 2; px = (diag - sw) // 2
+        gray_p = cv2.copyMakeBorder(
+            gray_s, py, diag - sh - py, px, diag - sw - px, cv2.BORDER_REPLICATE,
+        )
+        mask_p = cv2.copyMakeBorder(
+            mask_s, py, diag - sh - py, px, diag - sw - px,
+            cv2.BORDER_CONSTANT, value=0,
+        )
+        center = (diag / 2.0, diag / 2.0)
+        M = cv2.getRotationMatrix2D(center, angle_deg, 1.0)
+        gray_r = cv2.warpAffine(gray_p, M, (diag, diag),
+                                 flags=cv2.INTER_LINEAR,
+                                 borderMode=cv2.BORDER_REPLICATE)
+        mask_r = cv2.warpAffine(mask_p, M, (diag, diag),
+                                 flags=cv2.INTER_NEAREST, borderValue=0)
+        gx_t = cv2.Sobel(gray_r, cv2.CV_32F, 1, 0, ksize=3)
+        gy_t = cv2.Sobel(gray_r, cv2.CV_32F, 0, 1, ksize=3)
+        mag_t = cv2.magnitude(gx_t, gy_t)
+        _, bins_t = self._gradient(gray_r)
+        fx, fy, _ = self._extract_features(mag_t, bins_t, mask_r)
+        if len(fx) < 4:
+            return cx, cy
+        n = len(fx)
+        ddx_t = (fx - center[0]).astype(np.float32)
+        ddy_t = (fy - center[1]).astype(np.float32)
+        gx_tf = np.array([gx_t[int(fy[i]), int(fx[i])] for i in range(n)], dtype=np.float32)
+        gy_tf = np.array([gy_t[int(fy[i]), int(fx[i])] for i in range(n)], dtype=np.float32)
+        mag_tf = np.hypot(gx_tf, gy_tf) + 1e-6
+        nx_t = gx_tf / mag_tf
+        ny_t = gy_tf / mag_tf
+        gx_s = cv2.Sobel(scene_gray, cv2.CV_32F, 1, 0, ksize=3)
+        gy_s = cv2.Sobel(scene_gray, cv2.CV_32F, 0, 1, ksize=3)
+        H, W = scene_gray.shape
+        cur_cx, cur_cy = float(cx), float(cy)
+        for _ in range(n_iters):
+            xs = cur_cx + ddx_t
+            ys = cur_cy + ddy_t
+            xs_c = np.clip(xs, 0, W - 1.001)
+            ys_c = np.clip(ys, 0, H - 1.001)
+            x0 = xs_c.astype(np.int32); y0 = ys_c.astype(np.int32)
+            ax = xs_c - x0; ay = ys_c - y0
+            def _bilin(g):
+                v00 = g[y0, x0]; v10 = g[y0, x0 + 1]
+                v01 = g[y0 + 1, x0]; v11 = g[y0 + 1, x0 + 1]
+                return ((1 - ax) * (1 - ay) * v00
+                        + ax * (1 - ay) * v10
+                        + (1 - ax) * ay * v01
+                        + ax * ay * v11)
+            sx_v = _bilin(gx_s)
+            sy_v = _bilin(gy_s)
+            mag_s = np.hypot(sx_v, sy_v) + 1e-6
+            nx_s = sx_v / mag_s
+            ny_s = sy_v / mag_s
+            w = np.minimum(mag_s, 255.0).astype(np.float32)
+            err_x = (nx_s - nx_t) * w
+            err_y = (ny_s - ny_t) * w
+            step_x = -float(err_x.sum()) / (w.sum() + 1e-6)
+            step_y = -float(err_y.sum()) / (w.sum() + 1e-6)
+            step_x = max(-1.0, min(1.0, step_x))
+            step_y = max(-1.0, min(1.0, step_y))
+            cur_cx += step_x
+            cur_cy += step_y
+            if abs(step_x) < 0.02 and abs(step_y) < 0.02:
+                break
+        return cur_cx, cur_cy
+
     def _verify_ncc(
         self, scene_gray: np.ndarray, cx: float, cy: float,
-        angle_deg: float, scale: float,
+        angle_deg: float, scale: float, view_idx: int = 0,
     ) -> float:
         """NCC tra template warpato alla pose e scena sottostante.
 
@@ -800,9 +1196,9 @@ class LineShapeMatcher:
         il matcher linemod può dare score alto su texture generiche ma
         sovrapponendo il template gray i pixel non corrispondono.
         """
-        if self.template_gray is None:
+        t, train_mask = self._get_view_template(view_idx)
+        if t is None:
             return 1.0
-        t = self.template_gray
         h, w = t.shape
         cx_t = (w - 1) / 2.0
         cy_t = (h - 1) / 2.0
@@ -827,8 +1223,8 @@ class LineShapeMatcher:
             t, M, (cw, ch),
             flags=cv2.INTER_LINEAR, borderValue=0,
         )
-        if self._train_mask is not None:
+        if train_mask is not None:
-            mask_src = self._train_mask
+            mask_src = train_mask
         else:
             mask_src = np.full_like(t, 255)
         mask_w = cv2.warpAffine(
@@ -874,6 +1270,9 @@ class LineShapeMatcher:
         greediness: float = 0.0,
         batch_top: bool = False,
         nms_iou_threshold: float = 0.3,
+        min_recall: float = 0.0,
+        use_soft_score: bool = False,
+        subpixel_lm: bool = False,
     ) -> list[Match]:
         """
         scale_penalty: se > 0, riduce lo score per match a scala diversa da 1.0:
@@ -1223,6 +1622,13 @@ class LineShapeMatcher:
                     search_radius=self._effective_angle_step() / 2.0,
                     original_score=score,
                 )
+            # Halcon SubPixel='least_squares_high': refinement iterativo
+            # gradient-field per precisione 0.05 px (vs 0.5 quadratic 2D).
+            if subpixel_lm and self.template_gray is not None:
+                cx_lm, cy_lm = self._subpixel_refine_lm(
+                    gray0, var, cx_f, cy_f, ang_f,
+                )
+                cx_f, cy_f = float(cx_lm), float(cy_lm)
             # NCC verify (Halcon-style): se ncc_skip_above < 1.0 salta
             # il calcolo per shape-score gia alti. Default 1.01 = NCC sempre,
             # piu sicuro contro falsi positivi (lo shape-score satura facile).
@@ -1231,16 +1637,38 @@ class LineShapeMatcher:
             # ranking/visualizzazione (uno score 1.0 vero richiede sia
             # match shape sia template gray identici).
             if verify_ncc and float(score_f) < ncc_skip_above:
-                ncc = self._verify_ncc(gray0, cx_f, cy_f, ang_f, var.scale)
+                ncc = self._verify_ncc(
+                    gray0, cx_f, cy_f, ang_f, var.scale,
+                    view_idx=getattr(var, "view_idx", 0),
+                )
                 if ncc < verify_threshold:
                     continue
                 score_f = (float(score_f) + max(0.0, ncc)) * 0.5
+            # Soft-margin gradient similarity: sostituisce o integra lo
+            # score con metric continua (cos sim gradients) invece di
+            # bin discreto. Halcon-style: piu robusto a piccole rotazioni.
+            if use_soft_score:
+                soft = self._compute_soft_score(
+                    gray0, var, cx_f, cy_f, ang_f,
+                )
+                score_f = (float(score_f) + soft) * 0.5
             # Re-check min_score sullo score finale: NCC averaging puo
             # abbattere lo shape-score sotto la soglia user. Senza questo
             # check apparivano match con score < min_score (UI confusing).
             if float(score_f) < min_score:
                 continue
 
+            # Feature recall (Halcon MinScore-style): conta quante feature
+            # template effettivamente combaciano nello spread scena alla
+            # pose finale. Scarta se sotto min_recall (default 0 = off).
+            # Util contro match parziali ad alto NCC ma poche feature reali.
+            if min_recall > 0.0:
+                recall = self._compute_recall(
+                    spread0, var, cx_f, cy_f, ang_f,
+                )
+                if recall < min_recall:
+                    continue
+
             # Ri-traslo coord da spazio crop ROI a spazio scena originale.
             cx_out = cx_f + roi_offset[0]
             cy_out = cy_f + roi_offset[1]