diff --git a/offline.py b/offline.py index e16832f60f79357b2af1ee6aa0f659a19662aca6..bfb8b678ab5fd46bc5a64911cdabf4e42c4f25ee 100644 --- a/offline.py +++ b/offline.py @@ -31,7 +31,7 @@ def Solve(images, blackouts): """"DECISION VARIABLES""" # objective function to minimize - makepsan = model.addVar(lb=0, vtype=GRB.CONTINUOUS) + makespan = model.addVar(lb=0, vtype=GRB.CONTINUOUS) # Processing Volume = sum of length of images transmitted in whitebox t PV_t = model.addVars(whitebox_count, lb=0, vtype=GRB.CONTINUOUS) @@ -44,10 +44,10 @@ def Solve(images, blackouts): """CONSTRAINTS""" # minimize makespan - model.setObjective(makepsan, GRB.MINIMIZE) + model.setObjective(makespan, GRB.MINIMIZE) # end time is when the last filled whitebox finished processing all its images - model.addConstrs((makepsan >= (PV_t[t] + wb_t[t][0]) * (1-Xfree_t[t]) + model.addConstrs((makespan >= (PV_t[t] + wb_t[t][0]) * (1-Xfree_t[t]) for t in range(whitebox_count))) # sets Xfree_t to be (at least) 1 if there is no image in the whitebox