always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove OptionalIntVar from the sat Python API

Browse Source
This commit is contained in:
Laurent Perron
2018-08-31 16:56:55 +02:00
parent 93d7d6f566
commit 651e44cf0a
4 changed files with 17 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/python/gate_scheduling_sat.py
View File

@@ -60,19 +60,15 @@ def main():
performed.append(performed_on_m0)
# Create an optional copy of interval to be executed on machine 0.
start0 = model.NewOptionalIntVar(0, horizon, performed_on_m0,
'start_%i_on_m0' % i)
end0 = model.NewOptionalIntVar(0, horizon, performed_on_m0,
'end_%i_on_m0' % i)
start0 = model.NewIntVar(0, horizon, 'start_%i_on_m0' % i)
end0 = model.NewIntVar(0, horizon, 'end_%i_on_m0' % i)
interval0 = model.NewOptionalIntervalVar(
start0, duration, end0, performed_on_m0, 'interval_%i_on_m0' % i)
intervals0.append(interval0)
# Create an optional copy of interval to be executed on machine 1.
start1 = model.NewOptionalIntVar(0, horizon, performed_on_m0.Not(),
'start_%i_on_m1' % i)
end1 = model.NewOptionalIntVar(0, horizon, performed_on_m0.Not(),
'end_%i_on_m1' % i)
start1 = model.NewIntVar(0, horizon, 'start_%i_on_m1' % i)
end1 = model.NewIntVar(0, horizon, 'end_%i_on_m1' % i)
interval1 = model.NewOptionalIntervalVar(start1, duration, end1,
performed_on_m0.Not(),
'interval_%i_on_m1' % i)

6
examples/python/rcpsp_sat.py
View File

@@ -136,10 +136,8 @@ def SolveRcpsp(problem, proto_file):
for r in all_recipes:
recipe = task.recipes[r]
is_present = model.NewBoolVar('is_present_%i_r%i' % (t, r))
start = model.NewOptionalIntVar(0, horizon, is_present,
'start_%i_r%i' % (t, r))
end = model.NewOptionalIntVar(0, horizon, is_present,
'end_%i_r%i' % (t, r))
start = model.NewIntVar(0, horizon, 'start_%i_r%i' % (t, r))
end = model.NewIntVar(0, horizon, 'end_%i_r%i' % (t, r))
interval = model.NewOptionalIntervalVar(
start, recipe.duration, end, is_present, 'interval_%i_r%i' % (t, r))

16
examples/python/rostering_with_travel.py
View File

@@ -45,12 +45,10 @@ def SolveRosteringWithTravel():
job_performed.append(performed_on_m)
# Create an optional copy of interval to be executed on a machine
location0 = model.NewOptionalIntVar(
jobs[i][3], jobs[i][3], performed_on_m, 'location_%i_on_m%i' % (i, m))
start0 = model.NewOptionalIntVar(jobs[i][1], horizon, performed_on_m,
'start_%i_on_m%i' % (i, m))
end0 = model.NewOptionalIntVar(0, jobs[i][2], performed_on_m,
'end_%i_on_m%i' % (i, m))
location0 = model.NewIntVar(
jobs[i][3], jobs[i][3], 'location_%i_on_m%i' % (i, m))
start0 = model.NewIntVar(jobs[i][1], horizon, 'start_%i_on_m%i' % (i, m))
end0 = model.NewIntVar(0, jobs[i][2], 'end_%i_on_m%i' % (i, m))
interval0 = model.NewOptionalIntervalVar(
start0, duration, end0, performed_on_m, 'interval_%i_on_m%i' % (i, m))
optional_intervals[m].append(interval0)
@@ -59,10 +57,8 @@ def SolveRosteringWithTravel():
model.Add(start0 == start).OnlyEnforceIf(performed_on_m)
# Adding travel constraint
travel = model.NewBoolVar('is_travel_%i_on_m%i' % (i, m))
startT = model.NewOptionalIntVar(0, horizon, travel,
'start_%i_on_m%i' % (i, m))
endT = model.NewOptionalIntVar(0, horizon, travel,
'end_%i_on_m%i' % (i, m))
startT = model.NewIntVar(0, horizon, 'start_%i_on_m%i' % (i, m))
endT = model.NewIntVar(0, horizon, 'end_%i_on_m%i' % (i, m))
intervalT = model.NewOptionalIntervalVar(
startT, travel_time, endT, travel,
'travel_interval_%i_on_m%i' % (i, m))

56
ortools/sat/python/cp_model.py
View File

@@ -336,16 +336,14 @@ class _SumArray(IntegerExpression):
class IntVar(IntegerExpression):
"""Represents a IntegerExpression containing only a single variable."""
def __init__(self, model, bounds, name, is_present_index=None):
"""See CpModel.NewIntVar and .NewOptionalIntVar below."""
def __init__(self, model, bounds, name):
"""See CpModel.NewIntVar below."""
self.__model = model
self.__index = len(model.variables)
self.__var = model.variables.add()
self.__var.domain.extend(bounds)
self.__var.name = name
self.__negation = None
if is_present_index is not None:
self.__var.enforcement_literal.append(is_present_index)
def Index(self):
return self.__index
@@ -526,16 +524,6 @@ class CpModel(object):
"""
return IntVar(self.__model, bounds, name)
def NewOptionalIntVar(self, lb, ub, is_present, name):
"""Creates an optional integer variable."""
is_present_index = self.GetOrMakeBooleanIndex(is_present)
return IntVar(self.__model, [lb, ub], name, is_present_index)
def NewOptionalEnumeratedIntVar(self, bounds, is_present, name):
"""Creates an optional enumerated integer variable."""
is_present_index = self.GetOrMakeBooleanIndex(is_present)
return IntVar(self.__model, bounds, name, is_present_index)
def NewBoolVar(self, name):
"""Creates a 0-1 variable with the given name."""
return IntVar(self.__model, [0, 1], name)
@@ -1043,9 +1031,6 @@ class CpModel(object):
start_index = self.GetOrMakeIndex(start)
size_index = self.GetOrMakeIndex(size)
end_index = self.GetOrMakeIndex(end)
self.AssertIntVarIsNotOptional(start_index)
self.AssertIntVarIsNotOptional(size_index)
self.AssertIntVarIsNotOptional(end_index)
return IntervalVar(self.__model, start_index, size_index, end_index, None,
name)
@@ -1073,9 +1058,9 @@ class CpModel(object):
An IntervalVar object.
"""
is_present_index = self.GetOrMakeBooleanIndex(is_present)
start_index = self.GetOrMakeOptionalIndex(start, is_present)
size_index = self.GetOrMakeIndex(size) # Currently, not optional.
end_index = self.GetOrMakeOptionalIndex(end, is_present)
start_index = self.GetOrMakeIndex(start)
size_index = self.GetOrMakeIndex(size)
end_index = self.GetOrMakeIndex(end)
return IntervalVar(self.__model, start_index, size_index, end_index,
is_present_index, name)
@@ -1171,20 +1156,6 @@ class CpModel(object):
else:
raise TypeError('NotSupported: model.GetOrMakeIndex(' + str(arg) + ')')
def GetOrMakeOptionalIndex(self, arg, is_present):
"""Returns the index of an optional variable or constant (seen as a var)."""
if isinstance(arg, IntVar):
return arg.Index()
elif (isinstance(arg, _ProductCst) and
isinstance(arg.Expression(), IntVar) and arg.Coefficient() == -1):
return -arg.Expression().Index() - 1
elif isinstance(arg, numbers.Integral):
AssertIsInt64(arg)
return self.GetOrMakeOptionalIndexFromConstant(arg, is_present)
else:
raise TypeError('NotSupported: model.GetOrMakeOptionalIndex(%s, %s)' %
(arg, is_present))
def GetOrMakeBooleanIndex(self, arg):
"""Returns an index from a boolean expression."""
if isinstance(arg, IntVar):
@@ -1214,29 +1185,12 @@ class CpModel(object):
self.__constant_map[value] = index
return index
def GetOrMakeOptionalIndexFromConstant(self, value, is_present):
self.AssertIsBooleanVariable(is_present)
if (is_present, value) in self.__optional_constant_map:
return self.__optional_constant_map[(is_present, value)]
index = len(self.__model.variables)
var = self.__model.variables.add()
var.domain.extend([value, value])
var.enforcement_literal.append(self.GetOrMakeBooleanIndex(is_present))
self.__optional_constant_map[(is_present, value)] = index
return index
def VarIndexToVarProto(self, var_index):
if var_index > 0:
return self.__model.variables[var_index]
else:
return self.__model.variables[-var_index - 1]
def AssertIntVarIsNotOptional(self, var_index):
var = self.VarIndexToVarProto(var_index)
if var.enforcement_literal:
raise TypeError('Variable %s should not be marked as optional' %
ShortName(self.__model, var_index))
def _SetObjective(self, obj, minimize):
"""Sets the objective of the model."""
if isinstance(obj, IntVar):