From 1719dc993ab4ba2206dd42095649643d13517404 Mon Sep 17 00:00:00 2001
From: Laurent Perron <lperron@corp.google.com>
Date: Fri, 31 Aug 2018 16:36:17 +0200
Subject: [PATCH] remove OptionalIntVar from sat C# API #836

---
 examples/dotnet/gate_scheduling_sat.cs | 17 ++++++++---------
 ortools/sat/csharp/CpModel.cs          | 20 --------------------
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/examples/dotnet/gate_scheduling_sat.cs b/examples/dotnet/gate_scheduling_sat.cs
index d9ee8a1faf..5b21ce1fcd 100644
--- a/examples/dotnet/gate_scheduling_sat.cs
+++ b/examples/dotnet/gate_scheduling_sat.cs
@@ -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));
diff --git a/ortools/sat/csharp/CpModel.cs b/ortools/sat/csharp/CpModel.cs
index 8f71d36ee5..ce4b203366 100644
--- a/ortools/sat/csharp/CpModel.cs
+++ b/ortools/sat/csharp/CpModel.cs
@@ -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 };