passage à une fonction de coût de la forme coût*sigmoid(coût - 700

Appli-iso3dfd/tools.py

@@ -114,12 +114,12 @@ def add_pheromones(tau, paths, costs, Q, n1_size, n2_size, n3_size, n_cbx, n_cby
     for i in range(len(costs)):
         p = paths[i, :]
         cost = costs[i, 0]
-        tau[0,p[0]] += Q*(-1)*tools.sigmoid(cost-700)
-        tau[p[0], p[1] + n1_size] += Q*(-1)*tools.sigmoid(cost-700)
-        tau[p[1] + n1_size, p[2] + n1_size + n2_size] += Q*(-1)*tools.sigmoid(cost-700)
-        tau[p[2] + n1_size + n2_size, p[3] + n1_size + n2_size + n3_size] += Q*(-1)*tools.sigmoid(cost-700)
-        tau[p[3] + n1_size + n2_size + n3_size, p[4] + n1_size + n2_size + n3_size + n_cbx] += Q*(-1)*tools.sigmoid(cost-700)
-        tau[p[4] + n1_size + n2_size + n3_size + n_cbx, p[5] + n1_size + n2_size + n3_size + n_cbx + n_cby] += Q*(-1)*tools.sigmoid(cost-700)
+        tau[0,p[0]] += Q*(-1)*cost*sigmoid(cost-700)
+        tau[p[0], p[1] + n1_size] += Q*(-1)*cost*sigmoid(cost-700)
+        tau[p[1] + n1_size, p[2] + n1_size + n2_size] += Q*(-1)*cost*sigmoid(cost-700)
+        tau[p[2] + n1_size + n2_size, p[3] + n1_size + n2_size + n3_size] += Q*(-1)*cost*sigmoid(cost-700)
+        tau[p[3] + n1_size + n2_size + n3_size, p[4] + n1_size + n2_size + n3_size + n_cbx] += Q*(-1)*cost*sigmoid(cost-700)
+        tau[p[4] + n1_size + n2_size + n3_size + n_cbx, p[5] + n1_size + n2_size + n3_size + n_cbx + n_cby] += Q*(-1)*cost*sigmoid(cost-700)
 
     return tau