kilian/nmrproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated objectivefunktion

Browse Source
This commit is contained in:
kilian
2026-09-17 14:58:15 +02:00
parent 8d4d99d93a
commit 480fde0710
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ILP/butadien/butadiensynthesis.py
+6 -4
View File
@@ -156,10 +156,12 @@ def build_model(name, hyperedges, elmax, el1, el2, el3, excluded_support=None):
name="minimize_used_hyperedges", name="minimize_used_hyperedges",
) )
''' '''
model.setObjective(quicksum(1000 * elmax[e_id] * b[e_id] - x[e_id] for e_id in hyperedges),GRB.MAXIMIZE)
#model.setObjective(quicksum(1000 * elmax[e_id] * b[e_id] - (1 - elmax[e_id]) * x[e_id] for e_id in hyperedges),GRB.MAXIMIZE)
model.setObjective(quicksum(1000 * elmax[e_id] * b[e_id] - (1 / elmax[e_id]) * x[e_id] for e_id in hyperedges if elmax[e_id] != 0),GRB.MAXIMIZE)
#model.setObjective(quicksum(1000 * elmax[e_id] * b[e_id] + np.log(elmax[e_id]) * x[e_id] for e_id in hyperedges if elmax[e_id] != 0),GRB.MAXIMIZE)
#Excluding creation and destruction only three reactions for three nmr #Excluding creation and destruction only three reactions for three nmr
model.addConstr(quicksum(b[e_id] for e_id, (tails, heads) in hyperedges.items() if tails != [] and heads != []) == 3) #model.addConstr(quicksum(b[e_id] for e_id, (tails, heads) in hyperedges.items() if tails != [] and heads != []) == 3)
#Restrict number of used edges to prevent using all available #Restrict number of used edges to prevent using all available
#model.addConstr(quicksum(x[e_id] for e_id in hyperedges) <= 16) #model.addConstr(quicksum(x[e_id] for e_id in hyperedges) <= 16)
@@ -219,8 +221,8 @@ def main():
#Chosable parameters #Chosable parameters
modes = ["Product", "Average"] modes = ["Product", "Average"]
mode = modes[0] mode = modes[1]
normalize = False normalize = True
if normalize: if normalize:
NMR1 = [round(l/sum(NMR1), 2) for l in NMR1] NMR1 = [round(l/sum(NMR1), 2) for l in NMR1]