updates

test.py

@@ -158,8 +158,8 @@ def test(cfg,
  stats = [np.concatenate(x, 0) for x in list(zip(*stats))] # to numpy
  if len(stats):
  p, r, ap, f1, ap_class = ap_per_class(*stats)
- # if niou > 1:
- #  p, r, ap, f1 = p[:, 0], r[:, 0], ap[:, 0], ap.mean(1) # average across ious
+ if niou > 1:
+ p, r, ap, f1 = p[:, 0], r[:, 0], ap.mean(1), ap[:, 0] # [P, R, [email protected]:0.95, [email protected]]
  mp, mr, map, mf1 = p.mean(), r.mean(), ap.mean(), f1.mean()
  nt = np.bincount(stats[3].astype(np.int64), minlength=nc) # number of targets per class
  else:

utils/utils.py

@@ -863,7 +863,8 @@ def apply_classifier(x, model, img, im0):
 
 def fitness(x):
  # Returns fitness (for use with results.txt or evolve.txt)
- return x[:, 2] * 0.3 + x[:, 3] * 0.7 # weighted combination of x=[p, r, [email protected], F1 or [email protected]:0.95]
+ w = [0.1, 0.1, 0.6, 0.2] # weights for [P, R, mAP, F1]@0.5 or [P, R, [email protected]:0.95, [email protected]]
+ return (x[:, :4] * np.array([w])).sum(1)
 
 
 # Plotting functions ---------------------------------------------------------------------------------------------------