diff --git a/ortools/constraint_solver/csharp/IntVarArrayHelper.cs b/ortools/constraint_solver/csharp/IntVarArrayHelper.cs index d76e1c20d9..3c209803d5 100644 --- a/ortools/constraint_solver/csharp/IntVarArrayHelper.cs +++ b/ortools/constraint_solver/csharp/IntVarArrayHelper.cs @@ -174,7 +174,7 @@ public static class IntVarArrayHelper } } -// TODO(user): Try to move this code back to the .swig with @define macros. +// TODO(user): Try to move this code back to the .i with @define macros. public partial class IntVarVector : IDisposable, System.Collections.IEnumerable #if !SWIG_DOTNET_1 diff --git a/ortools/constraint_solver/csharp/constraint_solver.i b/ortools/constraint_solver/csharp/constraint_solver.i index 9c2103b51a..6e0c70bb29 100644 --- a/ortools/constraint_solver/csharp/constraint_solver.i +++ b/ortools/constraint_solver/csharp/constraint_solver.i @@ -929,7 +929,7 @@ PROTO2_RETURN(operations_research::CpModel, namespace operations_research { // Globals -// IMPORTANT(corentinl): Global will be placed in operations_research_constraint_solver.cs +// IMPORTANT(user): Global will be placed in operations_research_constraint_solver.cs // Ignored: %ignore FillValues; } // namespace operations_research diff --git a/ortools/constraint_solver/local_search.cc b/ortools/constraint_solver/local_search.cc index 6c8ad971d4..df6b478dab 100644 --- a/ortools/constraint_solver/local_search.cc +++ b/ortools/constraint_solver/local_search.cc @@ -2731,7 +2731,7 @@ class PathStateFilter : public LocalSearchFilter { // Selection-based algorithm in O(n^2), to use for small change sets. void MakeChainsFromChangedPathsAndArcsWithSelectionAlgorithm(); // From changed_paths_ and changed_arcs_, fill chains_ and paths_. - // Generic algorithm in O(std::sort(n)+n), to use for larger change sets. + // Generic algorithm in O(sort(n)+n), to use for larger change sets. void MakeChainsFromChangedPathsAndArcsWithGenericAlgorithm(); const std::unique_ptr path_state_; diff --git a/ortools/constraint_solver/routing.cc b/ortools/constraint_solver/routing.cc index 68a525bd40..b8153b1902 100644 --- a/ortools/constraint_solver/routing.cc +++ b/ortools/constraint_solver/routing.cc @@ -6564,6 +6564,7 @@ void RoutingDimension::InitializeTransits( InitializeTransitVariables(slack_max); } +// TODO(user): Apply -pointer-following. void FillPathEvaluation(const std::vector& path, const RoutingModel::TransitCallback2& evaluator, std::vector* values) { diff --git a/ortools/flatzinc/parser_main.cc b/ortools/flatzinc/parser_main.cc index c0153e8a6b..0cf0cfb31c 100644 --- a/ortools/flatzinc/parser_main.cc +++ b/ortools/flatzinc/parser_main.cc @@ -20,6 +20,7 @@ #include "absl/flags/flag.h" #include "ortools/base/commandlineflags.h" #include "ortools/base/init_google.h" +#include "ortools/base/logging_extensions.h" #include "ortools/base/timer.h" #include "ortools/flatzinc/model.h" #include "ortools/flatzinc/parser.h" diff --git a/ortools/glop/README.md b/ortools/glop/README.md new file mode 100644 index 0000000000..d32cc0ee8b --- /dev/null +++ b/ortools/glop/README.md @@ -0,0 +1,8 @@ +# Glop + +Glop is Google's Linear Optimization Package. It provides a fast, +precise, numerically stable, production-ready system for linear programming. + +It's written in C++ but can also be used from Java, Python, or C# via +our [linear solver wrapper](../linear_solver/). + diff --git a/ortools/init/java/InitTest.java b/ortools/init/java/InitTest.java index e9a41bb745..2ff2cfe303 100644 --- a/ortools/init/java/InitTest.java +++ b/ortools/init/java/InitTest.java @@ -14,9 +14,7 @@ package com.google.ortools.init; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; import com.google.ortools.Loader; import com.google.ortools.init.CppBridge; @@ -40,15 +38,15 @@ public final class InitTest { @Test public void testFlags() { - final CppFlags cpp_flags = new CppFlags(); - assertNotNull(cpp_flags); - cpp_flags.setLogtostderr(true); - cpp_flags.setLog_prefix(true); - cpp_flags.setCp_model_dump_prefix("init"); - cpp_flags.setCp_model_dump_models(true); - cpp_flags.setCp_model_dump_lns(true); - cpp_flags.setCp_model_dump_response(true); - CppBridge.setFlags(cpp_flags); + final CppFlags cppFlags = new CppFlags(); + assertNotNull(cppFlags); + cppFlags.setLogtostderr(true); + cppFlags.setLog_prefix(true); + cppFlags.setCp_model_dump_prefix("init"); + cppFlags.setCp_model_dump_models(true); + cppFlags.setCp_model_dump_lns(true); + cppFlags.setCp_model_dump_response(true); + CppBridge.setFlags(cppFlags); } @Test diff --git a/ortools/init/python/pywrapinit_test.py b/ortools/init/python/pywrapinit_test.py index 67aed30ede..73be618d6f 100755 --- a/ortools/init/python/pywrapinit_test.py +++ b/ortools/init/python/pywrapinit_test.py @@ -10,7 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -"""Simple unit tests for python/init.swig. Not exhaustive.""" +"""Simple unit tests for python/init.i. Not exhaustive.""" import unittest from ortools.init import pywrapinit diff --git a/ortools/linear_solver/java/linear_solver.i b/ortools/linear_solver/java/linear_solver.i index 3a361966fb..71c083e62f 100644 --- a/ortools/linear_solver/java/linear_solver.i +++ b/ortools/linear_solver/java/linear_solver.i @@ -12,6 +12,7 @@ // limitations under the License. // This .i file exposes the linear programming and integer programming +// solver. See the C++/Python codelab: (there isn't // a java codelab yet, as of July 2014) // // The java API is pretty much identical to the C++ API, with methods diff --git a/ortools/util/java/vector.i b/ortools/util/java/vector.i index 0186e0528b..57b59c42fe 100644 --- a/ortools/util/java/vector.i +++ b/ortools/util/java/vector.i @@ -13,7 +13,6 @@ // SWIG Macros to use std::vector and const std::vector& in Java, // where Num is an atomic numeric type. -// %include "stdint.i"