diff --git a/ILP/caffeinesynthesis.py b/ILP/caffeinesynthesis.py index eefced8..4d8f239 100644 --- a/ILP/caffeinesynthesis.py +++ b/ILP/caffeinesynthesis.py @@ -118,8 +118,8 @@ def build_model(name, hyperedges, vertices, nmrlikelihoods1, nmrlikelihoods2, nm #Multiply node value with infow or outflow ''' model.setObjectiveN( - quicksum(n1[t_id[0]] * c1[t_id[0]] * x[e_id] for e_id, (_, t_id) in hyperedges.items() if t_id != []) - +quicksum(n3[t_id[0]] * c3[t_id[0]] * x[e_id] for e_id, (_, t_id) in hyperedges.items() if t_id != []), + quicksum(n1[t_id[0]] * x[e_id] for e_id, (_, t_id) in hyperedges.items() if t_id != []) + +quicksum(n3[t_id[0]] * x[e_id] for e_id, (_, t_id) in hyperedges.items() if t_id != []), index = 0, priority = 2, name = "maximize_nmr_similarity",