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

remove OptionalIntVar from sat C# API #836

Browse Source
This commit is contained in:
Laurent Perron
2018-08-31 16:36:17 +02:00
parent 24c5e3c2c7
commit 1719dc993a
2 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
examples/dotnet/gate_scheduling_sat.cs
View File

@@ -85,21 +85,20 @@ public class GateSchedulingSat
performed.Add(performed_on_m0);
// Create an optional copy of interval to be executed on machine 0.
IntVar start0 = model.NewOptionalIntVar(
0, horizon, performed_on_m0, String.Format("start_{0}_on_m0", i));
IntVar end0 = model.NewOptionalIntVar(
0, horizon, performed_on_m0, String.Format("end_{0}_on_m0", i));
IntVar start0 = model.NewIntVar(
0, horizon, String.Format("start_{0}_on_m0", i));
IntVar end0 = model.NewIntVar(
0, horizon, String.Format("end_{0}_on_m0", i));
IntervalVar interval0 = model.NewOptionalIntervalVar(
start0, duration, end0, performed_on_m0,
String.Format("interval_{0}_on_m0", i));
intervals0.Add(interval0);
// Create an optional copy of interval to be executed on machine 1.
IntVar start1 = model.NewOptionalIntVar(
0, horizon, performed_on_m0.Not(),
String.Format("start_{0}_on_m1", i));
IntVar end1 = model.NewOptionalIntVar(0, horizon, performed_on_m0.Not(),
String.Format("end_{0}_on_m1", i));
IntVar start1 = model.NewIntVar(
0, horizon, String.Format("start_{0}_on_m1", i));
IntVar end1 = model.NewIntVar(
0, horizon, String.Format("end_{0}_on_m1", i));
IntervalVar interval1 = model.NewOptionalIntervalVar(
start1, duration, end1, performed_on_m0.Not(),
String.Format("interval_{0}_on_m1", i));

20
ortools/sat/csharp/CpModel.cs
View File

@@ -49,19 +49,6 @@ public class CpModel
return new IntVar(model_, bounds, name);
}
public IntVar NewOptionalIntVar(
long lb, long ub, ILiteral is_present, string name)
{
long[] bounds = { lb, ub };
return new IntVar(model_, bounds, is_present.GetIndex(), name);
}
public IntVar NewOptionalEnumeratedIntVar(
IEnumerable<long> bounds, ILiteral is_present, string name)
{
return new IntVar(model_, bounds, is_present.GetIndex(), name);
}
// Constants (named or not).
// TODO: Cache constant.
@@ -77,13 +64,6 @@ public class CpModel
return new IntVar(model_, bounds, name);
}
public IntVar NewOptionalConstant(
long value, ILiteral is_present, string name)
{
long[] bounds = { value, value };
return new IntVar(model_, bounds, is_present.GetIndex(), name);
}
public IntVar NewBoolVar(string name)
{
long[] bounds = { 0L, 1L };