Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 39208aadab |
+114
-114
@@ -226,6 +226,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:
|
||||
@@ -740,112 +854,6 @@ class LineShapeMatcher:
|
||||
s2, cx2, cy2 = _score_at_angle(x2)
|
||||
return best
|
||||
|
||||
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'. Per ogni feature
|
||||
template, calcola residuo = projection lungo gradient direction
|
||||
sull'edge subpixel scena. Ottimizza traslazione (dx, dy) che
|
||||
minimizza sum dei residui pesati, in iterazione.
|
||||
|
||||
Precisione attesa ±0.05 px (vs ±0.5 di quadratic fit 2D semplice).
|
||||
"""
|
||||
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
|
||||
# Pre-compute template offsets e gradient direction
|
||||
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
|
||||
|
||||
# Gradient scena (continuo)
|
||||
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):
|
||||
# Sample bilineare gx_s, gy_s ai punti proiettati
|
||||
xs = cur_cx + ddx_t
|
||||
ys = cur_cy + ddy_t
|
||||
# Clamp
|
||||
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
|
||||
# Residuo lungo direzione gradient template:
|
||||
# discordance(theta) misurata via prodotto vettoriale (sin(delta))
|
||||
# Valori weight: feature con scarsa magnitude scena hanno peso basso
|
||||
w = np.minimum(mag_s, 255.0).astype(np.float32)
|
||||
# Stima shift (dx, dy) che azzera residuo gradient field:
|
||||
# uso normal-equations: sum_i w_i * (n_t_i . shift) * n_t_i = sum_i w_i * (n_s_i - n_t_i) ?
|
||||
# Approccio piu' diretto: shift verso centroide gradient differences
|
||||
err_x = (nx_s - nx_t) * w
|
||||
err_y = (ny_s - ny_t) * w
|
||||
# Step proporzionale a -mean(err) (gradient descent damped)
|
||||
step_x = -float(err_x.sum()) / (w.sum() + 1e-6)
|
||||
step_y = -float(err_y.sum()) / (w.sum() + 1e-6)
|
||||
# Damping: limita step a 1px per iter per stabilita'
|
||||
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,
|
||||
@@ -934,7 +942,6 @@ class LineShapeMatcher:
|
||||
greediness: float = 0.0,
|
||||
batch_top: bool = False,
|
||||
nms_iou_threshold: float = 0.3,
|
||||
subpixel_lm: bool = False,
|
||||
) -> list[Match]:
|
||||
"""
|
||||
scale_penalty: se > 0, riduce lo score per match a scala diversa da 1.0:
|
||||
@@ -1284,13 +1291,6 @@ 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).
|
||||
|
||||
Reference in New Issue
Block a user