port more C# CP examples to CP-SAT

2018-11-20 14:47:46 -08:00
parent dbbe4d9829
commit 1831f30eba
9 changed files with 33 additions and 65 deletions
--- a/examples/dotnet/Google.OrTools.Examples.sln
+++ b/examples/dotnet/Google.OrTools.Examples.sln
@@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csfz", "csfz.csproj", "{FC7
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csintegerprogramming", "csintegerprogramming.csproj", "{DADE23EF-1101-4809-84D9-2DDEC3062808}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csjobshop", "csjobshop.csproj", "{95CF2603-1E49-457A-8A6E-92E9BCF725CE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JobshopSat", "JobshopSat.csproj", "{95CF2603-1E49-457A-8A6E-92E9BCF725CE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csknapsack", "csknapsack.csproj", "{AD880B2B-E474-4F71-8DFD-BFEF0A45F9FC}"
 EndProject
@@ -23,17 +23,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csrabbitspheasants", "csrab
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cstsp", "cstsp.csproj", "{939551F5-571E-4AD8-BB17-7F3AE264A382}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gate_scheduling_sat", "gate_scheduling_sat.csproj", "{3ECE933E-1121-457F-A203-C2F4CE8B8D5A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GateSchedulingSat", "GateSchedulingSat.csproj", "{3ECE933E-1121-457F-A203-C2F4CE8B8D5A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jobshop_ft06_sat", "jobshop_ft06_sat.csproj", "{C5A6F829-3D0D-4D95-9B95-4A3DE60F7BEE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JobshopFt06Sat", "JobshopFt06Sat.csproj", "{C5A6F829-3D0D-4D95-9B95-4A3DE60F7BEE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nurses_sat", "nurses_sat.csproj", "{FCC6C379-9D74-41E1-8EE2-378BD313FFE0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NursesSat", "NursesSat.csproj", "{FCC6C379-9D74-41E1-8EE2-378BD313FFE0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "slow_scheduling", "slow_scheduling.csproj", "{78E2AB93-3756-46D0-964F-B8EC0008CB18}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TaskSchedulingSat", "TaskSchedulingSat.csproj", "{37F04E33-FF84-41E4-ACD1-C96B6200969D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TaskScheduling", "TaskScheduling.csproj", "{37F04E33-FF84-41E4-ACD1-C96B6200969D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "techtalk_scheduling", "techtalk_scheduling.csproj", "{8D227FCD-C447-46BC-9434-6D9DFAB5D62D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpeakerSchedulingSat", "SpeakerSchedulingSat.csproj", "{8D227FCD-C447-46BC-9434-6D9DFAB5D62D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tsp", "tsp.csproj", "{245BD34B-F063-48F9-A485-3AAB7306D676}"
 EndProject
--- a/examples/dotnet/jobshop_ft06_sat.cs
+++ b/examples/dotnet/jobshop_ft06_sat.cs
--- a/examples/dotnet/JobshopFt06Sat.csproj
+++ b/examples/dotnet/JobshopFt06Sat.csproj
@@ -14,7 +14,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <Compile Include="TaskScheduling.cs" />
+    <Compile Include="JobshopFt06Sat.cs" />
    <PackageReference Include="Google.OrTools" Version="6.9.*" />
  </ItemGroup>
 </Project>
--- a/examples/dotnet/JobshopSat.cs
+++ b/examples/dotnet/JobshopSat.cs
@@ -173,7 +173,7 @@ class JobshopSat
    model.Minimize(makespan);


-    // Createe the solver.
+    // Create the solver.
    CpSolver solver = new CpSolver();
    // Set the time limit.
    if (timeLimitInSeconds > 0)
--- a/examples/dotnet/nurses_sat.cs
+++ b/examples/dotnet/nurses_sat.cs
@@ -68,7 +68,7 @@ public class NurseSolutionObserver : CpSolverSolutionCallback

 public class NursesSat
 {
-  static void Solve()
+  static void Main()
  {
    // Data.
    int num_nurses = 4;
@@ -212,8 +212,4 @@ public class NursesSat
    Console.WriteLine("  - wall time       : " + solver.WallTime() + " ms");
    Console.WriteLine("  - #solutions      : " + cb.SolutionCount());
  }
-
-  static void Main() {
-    Solve();
-  }
 }
--- a/examples/dotnet/nurses_sat.csproj
+++ b/examples/dotnet/nurses_sat.csproj
@@ -14,7 +14,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <Compile Include="nurses_sat.cs" />
+    <Compile Include="NursesSat.cs" />
    <PackageReference Include="Google.OrTools" Version="6.9.*" />
  </ItemGroup>
 </Project>
--- a/examples/dotnet/TaskSchedulingSat.cs
+++ b/examples/dotnet/TaskSchedulingSat.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Google.OrTools.ConstraintSolver;
+using Google.OrTools.Sat;

-namespace OrToolsConstraint {
 class Job {
  public Job(List<Task> tasks) {
    AlternativeTasks = tasks;
@@ -34,15 +33,7 @@ class Task {
  }
 }

-class Prefix : VoidToString
-{
-  public override string Run()
-  {
-    return "[TaskScheduling] ";
-  }
-}
-
-class TaskScheduling {
+class TaskSchedulingSat {
  public static List<Job> myJobList = new List<Job>();
  public static Dictionary<long, List<IntervalVar>> tasksToEquipment =
      new Dictionary<long, List<IntervalVar>>();
@@ -136,15 +127,15 @@ class TaskScheduling {
    return c;
  }

-  static void Main(string[] args) {
+  static void Main() {
    InitTaskList();
    int taskCount = GetTaskCount();

-    Solver solver = new Solver("ResourceConstraintScheduling");
+    CpModel model = new CpModel();

    IntervalVar[] tasks = new IntervalVar[taskCount];
    IntVar[] taskChoosed = new IntVar[taskCount];
-    IntVar[] makeSpan = new IntVar[GetEndTaskCount()];
+    IntVar[] allEnds = new IntVar[GetEndTaskCount()];

    int endJobCounter = 0;
    foreach (Job j in myJobList) {
@@ -152,50 +143,33 @@ class TaskScheduling {
      int i = 0;
      foreach (Task t in j.AlternativeTasks) {
        long ti = taskIndexes[t.Name];
-        taskChoosed[ti] = solver.MakeIntVar(0, 1, t.Name + "_choose");
+        taskChoosed[ti] = model.NewBoolVar(t.Name + "_choose");
        tmp[i++] = taskChoosed[ti];
-        tasks[ti] = solver.MakeFixedDurationIntervalVar(
-            0, 100000, t.Duration, false, t.Name + "_interval");
+        IntVar start = model.NewIntVar(0, 10000, t.Name + "_start");
+        IntVar end = model.NewIntVar(0, 10000, t.Name + "_end");
+        tasks[ti] = model.NewIntervalVar(start, t.Duration, end, t.Name + "_interval");
        if (j.Successor == null)
-          makeSpan[endJobCounter++] = tasks[ti].EndExpr().Var();
+          allEnds[endJobCounter++] = end;
        if (!tasksToEquipment.ContainsKey(t.Equipment))
          tasksToEquipment[t.Equipment] = new List<IntervalVar>();
        tasksToEquipment[t.Equipment].Add(tasks[ti]);
      }
-      solver.Add(IntVarArrayHelper.Sum(tmp) == 1);
+      model.Add(tmp.Sum() == 1);
    }

-    List<SequenceVar> all_seq = new List<SequenceVar>();
    foreach (KeyValuePair<long, List<IntervalVar>> pair in tasksToEquipment) {
-      DisjunctiveConstraint dc = solver.MakeDisjunctiveConstraint(
-          pair.Value.ToArray(), pair.Key.ToString());
-      solver.Add(dc);
-      all_seq.Add(dc.SequenceVar());
+      model.AddNoOverlap(pair.Value.ToArray());
    }

-    IntVar objective_var = solver.MakeMax(makeSpan).Var();
-    OptimizeVar objective_monitor = solver.MakeMinimize(objective_var, 1);
+    IntVar makespan = model.NewIntVar(0, 100000, "makespan");
+    model.AddMaxEquality(makespan, allEnds);
+    model.Minimize(makespan);

-    DecisionBuilder sequence_phase =
-        solver.MakePhase(all_seq.ToArray(), Solver.SEQUENCE_DEFAULT);
-    DecisionBuilder objective_phase =
-        solver.MakePhase(objective_var, Solver.CHOOSE_FIRST_UNBOUND,
-                         Solver.ASSIGN_MIN_VALUE);
-    DecisionBuilder main_phase = solver.Compose(sequence_phase, objective_phase);
-
-    const int kLogFrequency = 1000000;
-    VoidToString prefix = new Prefix();
-    SearchMonitor search_log =
-        solver.MakeSearchLog(kLogFrequency, objective_monitor, prefix);
-
-    SolutionCollector collector = solver.MakeLastSolutionCollector();
-    collector.Add(all_seq.ToArray());
-    collector.AddObjective(objective_var);
-
-    if (solver.Solve(main_phase, search_log, objective_monitor, null, collector))
-      Console.Out.WriteLine("Optimal solution = " + collector.ObjectiveValue(0));
-    else
-      Console.Out.WriteLine("No solution.");
+    // Create the solver.
+    CpSolver solver = new CpSolver();
+    // Solve the problem.
+    solver.Solve(model);
+    Console.WriteLine(solver.ResponseStats());
  }
 }
-}
+
--- a/examples/dotnet/TaskSchedulingSat.csproj
+++ b/examples/dotnet/TaskSchedulingSat.csproj
@@ -14,7 +14,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <Compile Include="jobshop_ft06_sat.cs" />
+    <Compile Include="TaskSchedulingSat.cs" />
    <PackageReference Include="Google.OrTools" Version="6.9.*" />
  </ItemGroup>
 </Project>
--- a/makefiles/Makefile.dotnet.mk
+++ b/makefiles/Makefile.dotnet.mk
@@ -647,7 +647,7 @@ test_dotnet_examples_csharp: \
 rdotnet_subset_sum.cs \
 rdotnet_sudoku.cs \
 rdotnet_survo_puzzle.cs \
- rdotnet_TaskScheduling.cs \
+ rdotnet_TaskSchedulingSat.cs \
 rdotnet_to_num.cs \
 rdotnet_traffic_lights.cs \
 rdotnet_tsp.cs \