minor changes

IspML · Dec 22, 2017 · 770ff64 · 770ff64
1 parent 3787c99
commit 770ff64
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/ortools/constraint_solver/csharp/constraint_solver.i b/ortools/constraint_solver/csharp/constraint_solver.i
@@ -1,4 +1,4 @@
-// Copyright 2010-2014 Google
+// Copyright 2010-2017 Google
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -111,7 +111,7 @@ namespace operations_research {
 PROTECT_FROM_FAILURE(IntExpr::SetValue(int64 v), arg1->solver());
 PROTECT_FROM_FAILURE(IntExpr::SetMin(int64 v), arg1->solver());
 PROTECT_FROM_FAILURE(IntExpr::SetMax(int64 v), arg1->solver());
-PROTECT_FROM_FAILURE(IntExpr::SetRange(int64 mi, int64 ma), arg1->solver());
+PROTECT_FROM_FAILURE(IntExpr::SetRange(int64 l, int64 u), arg1->solver());
 PROTECT_FROM_FAILURE(IntVar::RemoveValue(int64 v), arg1->solver());
 PROTECT_FROM_FAILURE(IntVar::RemoveValues(const std::vector<int64>& values),
                      arg1->solver());
@@ -128,7 +128,7 @@ PROTECT_FROM_FAILURE(IntervalVar::SetEndMax(int64 m), arg1->solver());
 PROTECT_FROM_FAILURE(IntervalVar::SetEndRange(int64 mi, int64 ma),
                      arg1->solver());
 PROTECT_FROM_FAILURE(IntervalVar::SetPerformed(bool val), arg1->solver());
-PROTECT_FROM_FAILURE(Solver::AddConstraint(Constraint* const ct), arg1);
+PROTECT_FROM_FAILURE(Solver::AddConstraint(Constraint* const c), arg1);
 PROTECT_FROM_FAILURE(Solver::Fail(), arg1);
 #undef PROTECT_FROM_FAILURE
 }  // namespace operations_research
@@ -329,15 +329,15 @@ namespace operations_research {
 // properly, so we write our custom wrappers for all methods involving
 // std::function<>.
 %ignore Solver::MakeSearchLog(
-    int branch_count,
+    int branch_period,
     std::function<std::string()> display_callback);
 %ignore Solver::MakeSearchLog(
-    int branch_count,
-    IntVar* objective,
+    int branch_period,
+    IntVar* var,
     std::function<std::string()> display_callback);
 %ignore Solver::MakeSearchLog(
-    int branch_count,
-    OptimizeVar* const objective,
+    int branch_period,
+    OptimizeVar* const opt_var,
     std::function<std::string()> display_callback);
 
 %ignore Solver::MakeActionDemon;

diff --git a/ortools/constraint_solver/java/constraint_solver.i b/ortools/constraint_solver/java/constraint_solver.i
@@ -1,4 +1,4 @@
-// Copyright 2010-2014 Google
+// Copyright 2010-2017 Google
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -80,7 +80,7 @@ namespace operations_research {
 PROTECT_FROM_FAILURE(IntExpr::SetValue(int64 v), arg1->solver());
 PROTECT_FROM_FAILURE(IntExpr::SetMin(int64 v), arg1->solver());
 PROTECT_FROM_FAILURE(IntExpr::SetMax(int64 v), arg1->solver());
-PROTECT_FROM_FAILURE(IntExpr::SetRange(int64 mi, int64 ma), arg1->solver());
+PROTECT_FROM_FAILURE(IntExpr::SetRange(int64 l, int64 u), arg1->solver());
 PROTECT_FROM_FAILURE(IntVar::RemoveValue(int64 v), arg1->solver());
 PROTECT_FROM_FAILURE(IntVar::RemoveValues(const std::vector<int64>& values),
                      arg1->solver());
@@ -97,7 +97,7 @@ PROTECT_FROM_FAILURE(IntervalVar::SetEndMax(int64 m), arg1->solver());
 PROTECT_FROM_FAILURE(IntervalVar::SetEndRange(int64 mi, int64 ma),
                      arg1->solver());
 PROTECT_FROM_FAILURE(IntervalVar::SetPerformed(bool val), arg1->solver());
-PROTECT_FROM_FAILURE(Solver::AddConstraint(Constraint* const ct), arg1);
+PROTECT_FROM_FAILURE(Solver::AddConstraint(Constraint* const c), arg1);
 PROTECT_FROM_FAILURE(Solver::Fail(), arg1);
 #undef PROTECT_FROM_FAILURE
 }  // namespace operations_research

diff --git a/ortools/constraint_solver/java/javawrapcp_util.h b/ortools/constraint_solver/java/javawrapcp_util.h
@@ -1,4 +1,4 @@
-// Copyright 2010-2014 Google
+// Copyright 2010-2017 Google
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

diff --git a/ortools/constraint_solver/python/constraint_solver.i b/ortools/constraint_solver/python/constraint_solver.i
@@ -1,4 +1,4 @@
-// Copyright 2010-2014 Google
+// Copyright 2010-2017 Google
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -699,7 +699,7 @@ namespace operations_research {
 PROTECT_FROM_FAILURE(IntExpr::SetValue(int64 v), arg1->solver());
 PROTECT_FROM_FAILURE(IntExpr::SetMin(int64 v), arg1->solver());
 PROTECT_FROM_FAILURE(IntExpr::SetMax(int64 v), arg1->solver());
-PROTECT_FROM_FAILURE(IntExpr::SetRange(int64 mi, int64 ma), arg1->solver());
+PROTECT_FROM_FAILURE(IntExpr::SetRange(int64 l, int64 u), arg1->solver());
 PROTECT_FROM_FAILURE(IntVar::RemoveValue(int64 v), arg1->solver());
 PROTECT_FROM_FAILURE(IntVar::RemoveValues(const std::vector<int64>& values),
                      arg1->solver());
@@ -716,7 +716,7 @@ PROTECT_FROM_FAILURE(IntervalVar::SetEndMax(int64 m), arg1->solver());
 PROTECT_FROM_FAILURE(IntervalVar::SetEndRange(int64 mi, int64 ma),
                      arg1->solver());
 PROTECT_FROM_FAILURE(IntervalVar::SetPerformed(bool val), arg1->solver());
-PROTECT_FROM_FAILURE(Solver::AddConstraint(Constraint* const ct), arg1);
+PROTECT_FROM_FAILURE(Solver::AddConstraint(Constraint* const c), arg1);
 PROTECT_FROM_FAILURE(Solver::Fail(), arg1);
 }  // namespace operations_research
 #undef PROTECT_FROM_FAILURE

diff --git a/ortools/constraint_solver/python/constraint_solver_helpers.i b/ortools/constraint_solver/python/constraint_solver_helpers.i
@@ -1,4 +1,4 @@
-// Copyright 2010-2014 Google
+// Copyright 2010-2017 Google
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at