author int64 658 755k | date stringlengths 19 19 | timezone int64 -46,800 43.2k | hash stringlengths 40 40 | message stringlengths 5 490 | mods list | language stringclasses 20 values | license stringclasses 3 values | repo stringlengths 5 68 | original_message stringlengths 12 491 |
|---|---|---|---|---|---|---|---|---|---|
261,230 | 24.11.2017 10:45:36 | -3,600 | c58f763ef171e7d659b02d3b7b17683155e0f5d4 | add data directory to C++ archives | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.archive.mk",
"new_path": "makefiles/Makefile.archive.mk",
"diff": "@@ -28,6 +28,7 @@ create_dirs:\n$(MKDIR) temp$S$(INSTALL_DIR)$Sinclude$Sortools$Salgorithms\n$(MKDIR) temp$S$(INSTALL_DIR)$Sinclude$Sortools$Sbase\n$(MKDIR) temp$S$(INSTALL_D... | C++ | Apache License 2.0 | google/or-tools | add data directory to C++ archives |
261,230 | 24.11.2017 10:45:49 | -3,600 | ca6aadcbc71e249893a528a7686a9a0ae08462f8 | improve README for python examples archive | [
{
"change_type": "MODIFY",
"old_path": "tools/README.examples.python",
"new_path": "tools/README.examples.python",
"diff": "-This file describes how to install the or-tools python binary archive.\n+This file describes how to use OR-Tools in python with the binary archives.\nOR-Tools is located at ht... | C++ | Apache License 2.0 | google/or-tools | improve README for python examples archive |
261,230 | 24.11.2017 11:03:56 | -3,600 | 598b11429a6e17d6b975762d102750580bddac1a | minor improvement to README | [
{
"change_type": "MODIFY",
"old_path": "README",
"new_path": "README",
"diff": "@@ -19,6 +19,7 @@ or-tools/\nexamples/data/ <- Data files for examples\nexamples/flatzinc/ <- Flatzinc examples\nexamples/fsharp/ <- F# examples\n+ examples/notebook/ <- Jupyter/IPython notebooks\nexamples/python/ <- Pyt... | C++ | Apache License 2.0 | google/or-tools | minor improvement to README |
261,230 | 24.11.2017 11:07:21 | -3,600 | b70b5481621127802ff6cf8ca602462e8e539efe | add missing API to BitQueue64 | [
{
"change_type": "MODIFY",
"old_path": "ortools/util/bitset.h",
"new_path": "ortools/util/bitset.h",
"diff": "@@ -716,6 +716,18 @@ class BitQueue64 {\ndata_[BitOffset64(i)] |= OneBit64(BitPos64(i));\n}\n+ // Sets all the bits from 0 up to i-1 to 1.\n+ void SetAllBefore(int i) {\n+ DCHECK_GE(i, 0);\n... | C++ | Apache License 2.0 | google/or-tools | add missing API to BitQueue64 |
261,218 | 24.11.2017 09:47:12 | -3,600 | ff4c5471285cbdc0f56c9113692e022b85ed9fef | Fix PYTHON_XXX substitution
By default on Windows, Python should be installed in C:\Program Files\...
leading to the error:
'C:\Program' is not recognized as an internal or external command,
operable program or batch file. | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.port.mk",
"new_path": "makefiles/Makefile.port.mk",
"diff": "@@ -174,7 +174,7 @@ ifeq (\"$(SYSTEM)\",\"win\")\nelse\nSELECTED_PATH_TO_PYTHON = WINDOWS_PATH_TO_PYTHON = $(DETECTED_PATH_TO_PYTHON)\nendif\n- WINDOWS_PYTHON_VERSION = $(shell $(W... | C++ | Apache License 2.0 | google/or-tools | Fix PYTHON_XXX substitution
By default on Windows, Python should be installed in C:\Program Files\...
leading to the error:
'C:\Program' is not recognized as an internal or external command,
operable program or batch file. |
261,230 | 24.11.2017 11:23:23 | -3,600 | 8b64f31a7150786398cf778b98c92082406e5585 | fix examples/notebook/README.md | [
{
"change_type": "MODIFY",
"old_path": "examples/notebook/README.md",
"new_path": "examples/notebook/README.md",
"diff": "# Introduction\nFirst and foremost, the Jupyter Notebook is an interactive environment for writing and running code.\n-# Perequisite: Python3\n+# Prerequisite: Python3\nThese not... | C++ | Apache License 2.0 | google/or-tools | fix examples/notebook/README.md |
261,218 | 24.11.2017 11:36:13 | -3,600 | 90438e85b91f3ea6ffbb36d4ac32ca77a1c06736 | Fix CANONIC_PYTHON_EXECUTABLE | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.python.mk",
"new_path": "makefiles/Makefile.python.mk",
"diff": "@@ -21,9 +21,10 @@ ifeq ($(shell $(PYTHON_EXECUTABLE) -c \"from sys import version_info as v; print\nendif\n# Main target\n-CANONIC_PYTHON_EXECUTABLE = $(subst $(SPACE),$(BACKS... | C++ | Apache License 2.0 | google/or-tools | Fix CANONIC_PYTHON_EXECUTABLE |
261,230 | 24.11.2017 13:33:03 | -3,600 | 0f83e0c3d3c406fff8b4a0fcc7640ffcf42d1bcc | defensive import of ortools/sat/python/visualization.py | [
{
"change_type": "MODIFY",
"old_path": "examples/python/jobshop_ft06_sat.py",
"new_path": "examples/python/jobshop_ft06_sat.py",
"diff": "import collections\nfrom ortools.sat.python import cp_model\n+from ortools.sat.python import visualization\ndef main():\n"
},
{
"change_type": "MODIFY",
... | C++ | Apache License 2.0 | google/or-tools | defensive import of ortools/sat/python/visualization.py |
261,230 | 24.11.2017 13:58:42 | -3,600 | 34904629d52881abadf5c8381e3cc67a23acbe4c | run_from_ipython() -> RunFromIPython() | [
{
"change_type": "MODIFY",
"old_path": "examples/notebook/gate_scheduling_sat.ipynb",
"new_path": "examples/notebook/gate_scheduling_sat.ipynb",
"diff": "\"\\n\",\n\"\\n\",\n\" # Output solution.\\n\",\n- \" if visualization.run_from_ipython():\\n\",\n+ \" if visualization.RunFromIPython():\\n\",\n\... | C++ | Apache License 2.0 | google/or-tools | run_from_ipython() -> RunFromIPython() |
261,230 | 24.11.2017 14:45:34 | -3,600 | 12ec1a989ae40b640c7786d6246d83b96d28d8ac | add StrictITIVectgor::reserve | [
{
"change_type": "MODIFY",
"old_path": "ortools/lp_data/lp_types.h",
"new_path": "ortools/lp_data/lp_types.h",
"diff": "@@ -268,6 +268,8 @@ class StrictITIVector : public ITIVector<IntType, T> {\nvoid resize(IntType size) { ParentType::resize(size.value()); }\nvoid resize(IntType size, const T& v) {... | C++ | Apache License 2.0 | google/or-tools | add StrictITIVectgor::reserve |
261,230 | 24.11.2017 14:47:10 | -3,600 | fc711a57489b01bad2634f8436568a510406860e | run_from_ipython -> RunFromIPython | [
{
"change_type": "MODIFY",
"old_path": "examples/notebook/gate_scheduling_sat.ipynb",
"new_path": "examples/notebook/gate_scheduling_sat.ipynb",
"diff": "\"\\n\",\n\"\\n\",\n\" # Output solution.\\n\",\n- \" if visualization.run_from_ipython():\\n\",\n+ \" if visualization.RunFromIPython():\\n\",\n\... | C++ | Apache License 2.0 | google/or-tools | run_from_ipython -> RunFromIPython |
261,218 | 24.11.2017 15:12:55 | -3,600 | d824ed88ce4adf81f48e42fb289a126ee3830439 | Fix JAVA variables | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.java.mk",
"new_path": "makefiles/Makefile.java.mk",
"diff": "@@ -385,6 +385,12 @@ test_java: test_java_examples\nBUILT_LANGUAGES +=, java\nendif\n+detect_java:\n+ @echo JDK_DIRECTORY = $(JDK_DIRECTORY)\n+ @echo JAVAC_BIN = $(JAVAC_BIN)\n+ @e... | C++ | Apache License 2.0 | google/or-tools | Fix JAVA variables |
261,218 | 28.11.2017 14:43:36 | -3,600 | a823ddbd63f51fbddb82a28a408c976abde825e8 | Fix VS2015 W/ splitting code | [
{
"change_type": "MODIFY",
"old_path": "ortools/constraint_solver/expressions.cc",
"new_path": "ortools/constraint_solver/expressions.cc",
"diff": "@@ -4919,50 +4919,46 @@ class DivIntExpr : public BaseIntExpr {\n~DivIntExpr() override {}\n+ // Due to VS 2015 cl.exe limitation, it is impossible to c... | C++ | Apache License 2.0 | google/or-tools | Fix VS2015 W/ splitting code |
261,230 | 29.11.2017 10:19:06 | -3,600 | dd660b8f94c7bd3f0b3e2c40a8366c264a7b4003 | speed up disjunctive on sat | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/cp_model_presolve.cc",
"new_path": "ortools/sat/cp_model_presolve.cc",
"diff": "@@ -1037,7 +1037,9 @@ bool PresolveInterval(ConstraintProto* ct, PresolveContext* context) {\ncontext->UpdateRuleStats(\"interval: reduced domains\");\n}\n- if (size.Is... | C++ | Apache License 2.0 | google/or-tools | speed up disjunctive on sat |
261,230 | 29.11.2017 11:49:13 | -3,600 | e993c93f4afbb6d772354fca2cd8e6bfe511cf8e | add data file to rcpsp notebook | [
{
"change_type": "MODIFY",
"old_path": "examples/notebook/rcpsp_sat.ipynb",
"new_path": "examples/notebook/rcpsp_sat.ipynb",
"diff": "{\n\"cell_type\": \"code\",\n\"execution_count\": null,\n- \"metadata\": {\n- \"collapsed\": false\n- },\n+ \"metadata\": {},\n\"outputs\": [],\n\"source\": [\n\"from... | C++ | Apache License 2.0 | google/or-tools | add data file to rcpsp notebook |
261,218 | 01.12.2017 15:30:47 | -3,600 | 707a8789bfac4fc3d15a9008e31d3036eb5492e3 | rework Makefile 'detect' target | [
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "@@ -6,6 +6,7 @@ help:\n@echo \" - Java: java test_java clean_java\"\n@echo \" - .NET: csharp test_csharp clean_csharp \"\n@echo \" - all: all test clean\"\n+ @echo \" - detect: detect_port detect_python detect_java d... | C++ | Apache License 2.0 | google/or-tools | rework Makefile 'detect' target |
261,218 | 01.12.2017 15:31:28 | -3,600 | 97b79ec5bbb59a953e74bcc8a4103e7d7c6b6db3 | Fix windows swig path in case of space in the path | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.win.mk",
"new_path": "makefiles/Makefile.win.mk",
"diff": "@@ -59,7 +59,7 @@ WINDOWS_ZLIB_DIR ?= $(OR_ROOT_FULL)\\\\dependencies\\\\install\nWINDOWS_ZLIB_NAME ?= zlib.lib\nWINDOWS_GFLAGS_DIR ?= $(OR_ROOT_FULL)\\\\dependencies\\\\install\nWIN... | C++ | Apache License 2.0 | google/or-tools | Fix windows swig path in case of space in the path |
261,218 | 01.12.2017 15:32:12 | -3,600 | 7d86f78bf2395ee0a8eebb19c821851112fd5088 | rework build_delivery_* scripts | [
{
"change_type": "MODIFY",
"old_path": "tools/build_delivery_mac.sh",
"new_path": "tools/build_delivery_mac.sh",
"diff": "#!/bin/bash\n-\necho Cleaning or-tools\nmake clean\necho Builing all libraries\nmake all fz -j 5 UNIX_PYTHON_VER=2.7\necho Running tests\nmake test UNIX_PYTHON_VER=2.7\n+\necho C... | C++ | Apache License 2.0 | google/or-tools | rework build_delivery_* scripts |
261,218 | 01.12.2017 15:32:58 | -3,600 | 6d4b180b3abd37756cfcadb17d8c51ca96c47713 | Add manylinux1-bash docker target | [
{
"change_type": "MODIFY",
"old_path": "tools/docker/Makefile",
"new_path": "tools/docker/Makefile",
"diff": "@@ -128,3 +128,6 @@ manylinux1-image-no-cache:\nmanylinux1-pypi: export manylinux1-image\ndocker run -v `pwd`/export:/export or-tools-manylinux1-image:latest /bin/bash -c \"/root/build/build... | C++ | Apache License 2.0 | google/or-tools | Add manylinux1-bash docker target |
261,230 | 05.12.2017 16:45:10 | -3,600 | c363991e2b23b2d470df9725fbea39f9eac77dcd | rearchitecture glop code | [
{
"change_type": "MODIFY",
"old_path": "examples/python/code_samples_sat.py",
"new_path": "examples/python/code_samples_sat.py",
"diff": "@@ -56,8 +56,6 @@ class VarArraySolutionPrinter(cp_model.CpSolverSolutionCallback):\nreturn self.__solution_count\n-\n-\ndef MinimalCpSatAllSolutions():\n# Create... | C++ | Apache License 2.0 | google/or-tools | rearchitecture glop code |
261,243 | 05.12.2017 22:29:34 | 28,800 | d657f7392209e9b01bf5551ca1d739c14549f899 | Correct sign for third equation constraint | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -70,3 +70,5 @@ tools/docker/export\n.idea/*\n.idea/\nbuild/\n+\n+.DS_Store\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/fsharp/equality-inequality.fsx",
"new_path": "examples/fsharp/e... | C++ | Apache License 2.0 | google/or-tools | Correct sign for third equation constraint |
261,243 | 22.12.2017 00:18:17 | 28,800 | 53860de6c39e87eb6eadfdcfc0f829f5b3c306ee | Adding Network examples | [
{
"change_type": "MODIFY",
"old_path": "examples/fsharp/equality.fsx",
"new_path": "examples/fsharp/equality.fsx",
"diff": "open System\nopen Google.OrTools.FSharp\n-open Google.OrTools.LinearSolver\nlet opts = SolverOpts.Default\n.Name(\"Equality Constraints\")\n@@ -36,3 +35,4 @@ let opts = SolverO... | C++ | Apache License 2.0 | google/or-tools | Adding Network examples |
261,230 | 26.12.2017 10:32:45 | -3,600 | a4754b1222d84a34eef89200fe47813a3aca1876 | add sat examplt to make test_python | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.test.mk",
"new_path": "makefiles/Makefile.test.mk",
"diff": "@@ -15,6 +15,7 @@ test_python_examples: python\n$(SET_PYTHONPATH) $(PYTHON_EXECUTABLE) $(EX_DIR)$Spython$Stsp.py\n$(SET_PYTHONPATH) $(PYTHON_EXECUTABLE) $(EX_DIR)$Spython$Spyflow_e... | C++ | Apache License 2.0 | google/or-tools | add sat examplt to make test_python |
261,243 | 26.12.2017 20:06:47 | 28,800 | 6287fe375f36b9bc5a0a6bef66534d9dcb6e1cd8 | Adding Knapsack example | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -70,5 +70,5 @@ tools/docker/export\n.idea/*\n.idea/\nbuild/\n-\n+**/.vscode/*\n.DS_Store\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/fsharp/knapsack.fsx",
"diff": ... | C++ | Apache License 2.0 | google/or-tools | Adding Knapsack example |
261,218 | 01.12.2017 15:32:12 | -3,600 | c8d483d3e0447159b1f78dcb143cd238cd51da3b | rework build_delivery_mac scripts | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "test.py.in",
"diff": "+from ortools.linear_solver import pywraplp\n+from ortools.constraint_solver import pywrapcp\n+from ortools.sat import pywrapsat\n+from ortools.graph import pywrapgraph\n+from ortools.algorithms import pywrapknapsack_solver... | C++ | Apache License 2.0 | google/or-tools | rework build_delivery_mac scripts |
261,218 | 29.12.2017 10:27:56 | -3,600 | 05cc36790cb351ce1b4e073d03aa641b4146748a | fix mono on mac | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.unix.mk",
"new_path": "makefiles/Makefile.unix.mk",
"diff": "@@ -208,7 +208,7 @@ ifeq ($(PLATFORM),MACOSX)\nJNI_LIB_EXT = jnilib\nCSC = $(PATH_TO_CSHARP_COMPILER)\n- MONO = DYLD_FALLBACK_LIBRARY_PATH=$(LIB_DIR):$(DYLD_LIBRARY_PATH) mono64\n+... | C++ | Apache License 2.0 | google/or-tools | fix mono on mac |
261,230 | 29.12.2017 11:14:08 | -3,600 | aad245304ff56f34999e4600f5e8046c7cdef61e | fix compilation of sat_runner | [
{
"change_type": "MODIFY",
"old_path": "examples/cpp/sat_cnf_reader.h",
"new_path": "examples/cpp/sat_cnf_reader.h",
"diff": "@@ -34,6 +34,8 @@ DEFINE_bool(wcnf_use_strong_slack, true,\n\"If true, when we add a slack variable to reify a soft clause, we \"\n\"enforce the fact that when it is true, th... | C++ | Apache License 2.0 | google/or-tools | fix compilation of sat_runner |
261,243 | 04.01.2018 16:14:49 | 28,800 | d54aafb02a3e4b32990399a1c56ad36481cb9f12 | Adding Linear Programming example for network flows. Some refactoring for flow results. | [
{
"change_type": "MODIFY",
"old_path": "examples/fsharp/lib/Google.OrTools.FSharp.fsx",
"new_path": "examples/fsharp/lib/Google.OrTools.FSharp.fsx",
"diff": "@@ -79,40 +79,37 @@ type LinearSolverAlgorithm =\n| IP of IntegerProgramming\n/// Max Flow Solver Result\n-module MaximumFlow =\n- let (|Optim... | C++ | Apache License 2.0 | google/or-tools | Adding Linear Programming example for network flows. Some refactoring for flow results. |
261,230 | 08.01.2018 09:17:31 | -3,600 | 53213124d3653b5fd717b5b3d94757bd3bd60eee | protobuf -> 3.5.1 | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "makefiles/Makefile.third_party.unix.mk",
"diff": "# SVN tags of dependencies to checkout.\nGFLAGS_TAG = 2.2.1\n-PROTOBUF_TAG = 3.5.0\n+PROTOBUF_TAG = 3.5.1\nGLOG_TAG = 0.3.5\nCBC_TAG = 2.9.9\n"
},
{
... | C++ | Apache License 2.0 | google/or-tools | protobuf -> 3.5.1 |
261,218 | 08.01.2018 17:29:15 | -3,600 | 732ae52d7a432f4a44b0a346411d66ef2e0ad705 | Replace Cbc svn by tarball
i.e. no need svn anymore as dependencies | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "makefiles/Makefile.third_party.unix.mk",
"diff": "@@ -226,14 +226,17 @@ dependencies/sources/glog-$(GLOG_TAG)/CMakeLists.txt:\n# Install Coin CBC.\ninstall_cbc: dependencies/install/bin/cbc\n-dependencies/i... | C++ | Apache License 2.0 | google/or-tools | Replace Cbc svn by tarball
i.e. no need svn anymore as dependencies |
261,230 | 10.01.2018 13:20:24 | -3,600 | d0dabc6f4d50856dd60700add55eda6d88c08c8a | complete implementation of inlined vectos | [
{
"change_type": "MODIFY",
"old_path": "ortools/base/inlined_vector.h",
"new_path": "ortools/base/inlined_vector.h",
"diff": "namespace absl {\n-template <typename T, int N>\n+template <typename T, int N, typename A = std::allocator<T> >\nclass InlinedVector {\npublic:\n- typedef T value_type;\n- ty... | C++ | Apache License 2.0 | google/or-tools | complete implementation of inlined vectos |
261,218 | 10.01.2018 23:16:18 | -3,600 | 34d94e9983c75ead9616dfac811c782667452e47 | Fix _pywrapsat.so and _pywraprcpsp.so rpath on linux | [
{
"change_type": "MODIFY",
"old_path": "tools/fix_python_libraries_on_linux.sh",
"new_path": "tools/fix_python_libraries_on_linux.sh",
"diff": "-dependencies/install/bin/patchelf --set-rpath '$ORIGIN/../../ortools' $1/ortools/ortools/constraint_solver/_pywrapcp.so\n-dependencies/install/bin/patchelf... | C++ | Apache License 2.0 | google/or-tools | Fix _pywrapsat.so and _pywraprcpsp.so rpath on linux (#556) |
261,243 | 18.01.2018 17:49:33 | 28,800 | b5ec5fd229e2fbbf517333e55dd13d2fb5a718d2 | Adding Makefile to create library and referecing library only. | [
{
"change_type": "MODIFY",
"old_path": "examples/fsharp/README.md",
"new_path": "examples/fsharp/README.md",
"diff": "@@ -9,18 +9,18 @@ to enter the Linear/Integer program as matrices & vectors. Two input formats are\n*__ALL Matrices & Vectors are entered as columns__*\n## Execution\n-Be sure to com... | C++ | Apache License 2.0 | google/or-tools | Adding Makefile to create library and referecing library only. |
261,218 | 18.01.2018 15:15:13 | -3,600 | 8bd5acee1a5c83f65c02f8818d142a7f6954f855 | Add Test & Examples
Tests:
Add cc test
Add python test
Examples:
Add examples/cpp
Add examples/data
Add examples/notebook
Add examples/python | [
{
"change_type": "MODIFY",
"old_path": "CMakeLists.txt",
"new_path": "CMakeLists.txt",
"diff": "@@ -62,3 +62,10 @@ include(cpp)\ninclude(python)\ninclude(java)\ninclude(csharp)\n+\n+if(BUILD_TESTING)\n+ add_subdirectory(examples/cpp)\n+ add_subdirectory(examples/data)\n+ add_subdirectory(examples/py... | C++ | Apache License 2.0 | google/or-tools | Add Test & Examples
Tests:
- Add cc test
- Add python test
Examples:
- Add examples/cpp
- Add examples/data
- Add examples/notebook
- Add examples/python
Signed-off-by: Corentin Le Molgat <corentinl@google.com> |
261,279 | 07.05.2015 13:38:17 | -10,800 | 507375764d675427a11fa658eb17d201f3bf773a | Fix csharp cscvrptw example. Protect callbacks from GC. | [
{
"change_type": "MODIFY",
"old_path": "examples/csharp/cscvrptw.cs",
"new_path": "examples/csharp/cscvrptw.cs",
"diff": "@@ -241,10 +241,12 @@ public class CapacitatedVehicleRoutingProblemWithTimeWindows {\nmodel.AddDimension(demand_callback, 0, vehicle_capacity_, true, \"capacity\");\n// Setting u... | C++ | Apache License 2.0 | google/or-tools | Fix csharp cscvrptw example. Protect callbacks from GC. |
261,218 | 22.01.2018 14:33:20 | -3,600 | 19ae1c121c11743ba3d55bfb4ec57af5c2bc3fc6 | Fix python loader_path | [
{
"change_type": "MODIFY",
"old_path": "ortools/algorithms/python/CMakeLists.txt",
"new_path": "ortools/algorithms/python/CMakeLists.txt",
"diff": "@@ -42,7 +42,7 @@ if(UNIX)\nelse()\nset_target_properties(${SWIG_MODULE_pywrapknapsack_solver_REAL_NAME} PROPERTIES\nSUFFIX \".so\"\n- INSTALL_RPATH \"@... | C++ | Apache License 2.0 | google/or-tools | Fix python loader_path |
261,218 | 22.01.2018 16:55:15 | -3,600 | 8b222ebec2f5b4fb54de2d09391e612308da74f5 | Only create wheel package if wheel module found | [
{
"change_type": "MODIFY",
"old_path": "cmake/python.cmake",
"new_path": "cmake/python.cmake",
"diff": "@@ -140,11 +140,26 @@ add_custom_command(OUTPUT setup.py dist ${PROJECT_NAME}.egg-info\nCOMMAND ${CMAKE_COMMAND} -E echo \")\" >> setup.py\nVERBATIM)\n+# Look for python module wheel\n+execute_pro... | C++ | Apache License 2.0 | google/or-tools | Only create wheel package if wheel module found |
261,218 | 22.01.2018 16:55:40 | -3,600 | eea490583d5b90d3132427c828f4af8567181d7f | Only create test if virtualenv module found | [
{
"change_type": "MODIFY",
"old_path": "cmake/python.cmake",
"new_path": "cmake/python.cmake",
"diff": "@@ -164,6 +164,15 @@ add_custom_target(bdist ALL\n# Test\nif(BUILD_TESTING)\n+ # Look for python module virtualenv\n+ execute_process(\n+ COMMAND ${PYTHON_EXECUTABLE} \"-c\" \"import virtualenv\"\... | C++ | Apache License 2.0 | google/or-tools | Only create test if virtualenv module found |
261,218 | 22.01.2018 16:56:21 | -3,600 | a5542dc5ccb96576e4b1ed1c78ad148e98b3696f | Python unix wrapper only depend on ortools soname | [
{
"change_type": "MODIFY",
"old_path": "cmake/python.cmake",
"new_path": "cmake/python.cmake",
"diff": "@@ -107,7 +107,7 @@ add_custom_command(OUTPUT setup.py dist ${PROJECT_NAME}.egg-info\nCOMMAND ${CMAKE_COMMAND} -E echo \" distclass=BinaryDistribution,\" >> setup.py\nCOMMAND ${CMAKE_COMMAND} -E e... | C++ | Apache License 2.0 | google/or-tools | Python unix wrapper only depend on ortools soname |
261,243 | 26.01.2018 18:13:23 | 28,800 | ae3641b68e33f8e1833f5a212a5bf72f142301c6 | Integration into main makefile | [
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "@@ -4,7 +4,8 @@ help:\n@echo \" - C++: cc test_cc clean_cc\"\n@echo \" - Python: python test_python clean_python\"\n@echo \" - Java: java test_java clean_java\"\n- @echo \" - .NET: csharp test_csharp clean_csharp \"\... | C++ | Apache License 2.0 | google/or-tools | Integration into main makefile |
261,218 | 29.01.2018 10:26:03 | -3,600 | 9a8e8fb6bea324f2ca189088ca7739ce4428ba34 | search python module, and install it if needed | [
{
"change_type": "MODIFY",
"old_path": "cmake/python.cmake",
"new_path": "cmake/python.cmake",
"diff": "@@ -140,39 +140,39 @@ add_custom_command(OUTPUT setup.py dist ${PROJECT_NAME}.egg-info\nCOMMAND ${CMAKE_COMMAND} -E echo \")\" >> setup.py\nVERBATIM)\n-# Look for python module wheel\n+function(se... | C++ | Apache License 2.0 | google/or-tools | search python module, and install it if needed |
261,218 | 23.01.2018 10:08:37 | -3,600 | 5759af1a974f5d33d06c3cb23c3902ee1da7384f | Move CMake gflags target to its own namespace.
Use gflags::gflags as others deps to be more consistent and modern | [
{
"change_type": "MODIFY",
"old_path": "cmake/cpp.cmake",
"new_path": "cmake/cpp.cmake",
"diff": "@@ -89,7 +89,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE\n$<INSTALL_INTERFACE:include>\n)\ntarget_link_libraries(${PROJECT_NAME} PUBLIC\n- protobuf::libprotobuf gflags glog\n+ protobuf::li... | C++ | Apache License 2.0 | google/or-tools | Move CMake gflags target to its own namespace.
Use gflags::gflags as others deps to be more consistent and modern |
261,218 | 23.01.2018 17:38:28 | -3,600 | 84c2eade38f65deefa590a8b962c2fc6a3074781 | update gflags comment to use gflags::gflags | [
{
"change_type": "MODIFY",
"old_path": "patches/gflags.patch",
"new_path": "patches/gflags.patch",
"diff": "diff --git a/CMakeLists.txt b/CMakeLists.txt\n-index 3709073..b49f18e 100644\n+index 3709073..59bfcb0 100644\n--- a/CMakeLists.txt\n+++ b/CMakeLists.txt\n-@@ -14,7 +14,7 @@\n+@@ -14,9 +14,9 @@... | C++ | Apache License 2.0 | google/or-tools | update gflags comment to use gflags::gflags |
261,218 | 23.01.2018 17:38:41 | -3,600 | ebcdeb0e200d0e9f2a496b5cc1a417d009eabb37 | add version to gflags | [
{
"change_type": "MODIFY",
"old_path": "patches/gflags.patch",
"new_path": "patches/gflags.patch",
"diff": "@@ -41,6 +41,26 @@ index 3709073..59bfcb0 100644\n##\n## Variables to configure the source files:\n## - GFLAGS_IS_A_DLL\n+@@ -76,6 +76,10 @@ if (POLICY CMP0042)\n+ cmake_policy (SET CMP0042 NE... | C++ | Apache License 2.0 | google/or-tools | add version to gflags |
261,218 | 23.01.2018 17:39:06 | -3,600 | 00a3fc39e551192b84e3223993a7ba0ab6c2b460 | add comment to glog CmakeLists.txt | [
{
"change_type": "MODIFY",
"old_path": "patches/glog.patch",
"new_path": "patches/glog.patch",
"diff": "diff --git a/CMakeLists.txt b/CMakeLists.txt\n-index 5739702..f57951a 100644\n+index 5739702..6077a67 100644\n--- a/CMakeLists.txt\n+++ b/CMakeLists.txt\n-@@ -409,6 +409,7 @@ add_compile_options (... | C++ | Apache License 2.0 | google/or-tools | add comment to glog CmakeLists.txt |
261,218 | 23.01.2018 11:40:44 | -3,600 | 4a73379bf2ab3559de024b92f3ed63aac6e960bf | use target_compile_features() | [
{
"change_type": "MODIFY",
"old_path": "cmake/cpp.cmake",
"new_path": "cmake/cpp.cmake",
"diff": "@@ -64,6 +64,7 @@ if(BUILD_SHARED_LIBS)\nelse()\nadd_library(${PROJECT_NAME} STATIC \"\")\nendif()\n+target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)\nif(NOT APPLE)\nset_target_properties(${P... | C++ | Apache License 2.0 | google/or-tools | use target_compile_features() |
261,218 | 23.01.2018 17:39:16 | -3,600 | 6b4264830c6a330433446c888c04cd293dbcdc21 | Enable install rules for deps | [
{
"change_type": "MODIFY",
"old_path": "cmake/external/CMakeLists.txt",
"new_path": "cmake/external/CMakeLists.txt",
"diff": "@@ -6,14 +6,8 @@ set(BUILD_SHARED_BCKP ${BUILD_SHARED_LIBS})\nset(BUILD_SHARED_LIBS OFF)\n# Disable test rules for dependencies\n-set(BUILD_TESTING_BCKP ${CMAKE_SKIP_INSTALL_... | C++ | Apache License 2.0 | google/or-tools | Enable install rules for deps |
261,218 | 06.02.2018 13:49:02 | -3,600 | 5a68b6e484d5178457bb187d3790df29aa48565a | Add Cbc subproject to install target | [
{
"change_type": "MODIFY",
"old_path": "cmake/external/CMakeLists.txt",
"new_path": "cmake/external/CMakeLists.txt",
"diff": "@@ -174,8 +174,7 @@ endif()\nadd_subdirectory(\n${CMAKE_BINARY_DIR}/cbc-src\n- ${CMAKE_BINARY_DIR}/cbc-build\n- EXCLUDE_FROM_ALL)\n+ ${CMAKE_BINARY_DIR}/cbc-build)\nmessage(S... | C++ | Apache License 2.0 | google/or-tools | Add Cbc subproject to install target |
261,218 | 24.01.2018 17:14:22 | -3,600 | 6a9584794aaa28f79b4cc2dee19d5c8de732c0b4 | Update export to ortoolsTargets.cmake
Use export in Cbc (master)
Patch Protobuf to work
Remove glog patch which disable install(export ...) | [
{
"change_type": "MODIFY",
"old_path": "cmake/cpp.cmake",
"new_path": "cmake/cpp.cmake",
"diff": "@@ -90,11 +90,12 @@ target_include_directories(${PROJECT_NAME} INTERFACE\n$<INSTALL_INTERFACE:include>\n)\ntarget_link_libraries(${PROJECT_NAME} PUBLIC\n- protobuf::libprotobuf gflags::gflags glog::glog... | C++ | Apache License 2.0 | google/or-tools | Update export to ortoolsTargets.cmake
- Use export in Cbc (master)
- Patch Protobuf to work
- Remove glog patch which disable install(export ...) |
261,218 | 26.01.2018 17:27:19 | -3,600 | 2d4f9cccdb72ff6b3ea295f89b03b61e8fdb612d | Move ortoolsConfig.cmake.in in cmake dir.
remove duplicate | [
{
"change_type": "MODIFY",
"old_path": "cmake/cpp.cmake",
"new_path": "cmake/cpp.cmake",
"diff": "@@ -187,7 +187,7 @@ install(DIRECTORY ${PROJECT_BINARY_DIR}/ortools\ninclude(CMakePackageConfigHelpers)\nstring (TOUPPER \"${PROJECT_NAME}\" PACKAGE_PREFIX)\n-configure_package_config_file(${PROJECT_NAM... | C++ | Apache License 2.0 | google/or-tools | Move ortoolsConfig.cmake.in in cmake dir.
- remove duplicate |
261,218 | 02.02.2018 11:50:30 | -3,600 | 50b9146721e18ff16bf5ce0ce63f0971b60ff722 | Remove cmake dead file
not in use anymore | [
{
"change_type": "DELETE",
"old_path": "cmake/dependencies.cmake",
"new_path": null,
"diff": "-enable_language(CXX)\n-\n-if (MSVC)\n- add_definitions(/bigobj /DNDEBUG /DUSE_GLOP /DUSE_BOP)\n-else()\n- add_definitions(-fwrapv -DNDEBUG -DUSE_GLOP -DUSE_BOP)\n-endif()\n-\n-if (NOT BUILD_DEPS)\n- return... | C++ | Apache License 2.0 | google/or-tools | Remove cmake dead file
not in use anymore |
261,218 | 02.02.2018 17:14:22 | -3,600 | 97166d24f2a71429a6d9e3e97d4f64215ca0bac1 | Patch protobuff .config export | [
{
"change_type": "MODIFY",
"old_path": "patches/protobuf.patch",
"new_path": "patches/protobuf.patch",
"diff": "@@ -39,7 +39,7 @@ index f159f60e..549c7fd2 100644\nset(CMAKE_STATIC_LINKER_FLAGS /ignore:4221)\nendif (MSVC)\ndiff --git a/cmake/install.cmake b/cmake/install.cmake\n-index 441bf553..6beab... | C++ | Apache License 2.0 | google/or-tools | Patch protobuff .config export |
261,218 | 06.02.2018 13:48:25 | -3,600 | 083da57bf36ab910b80a5dc70d44780ae6ded3d2 | Fix ortools cbc:: namespace use for target dependencies | [
{
"change_type": "MODIFY",
"old_path": "cmake/cpp.cmake",
"new_path": "cmake/cpp.cmake",
"diff": "@@ -92,7 +92,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE\ntarget_link_libraries(${PROJECT_NAME} PUBLIC\ngflags::gflags glog::glog\nZLIB::ZLIB protobuf::libprotobuf\n- Cbc::CbcSolver Cbc::O... | C++ | Apache License 2.0 | google/or-tools | Fix ortools cbc:: namespace use for target dependencies |
261,218 | 02.02.2018 17:35:18 | -3,600 | a538af550e2c3bc258ee165f5ae14310204fb37a | Add cmake/Makefile to test cmake build and install
This makefile orchestrate the use of cmake/docker to test cmake
add cache/ to .gitignore | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -71,5 +71,6 @@ tools/docker/export\n.idea/*\n.idea/\nbuild/\n+cache/\n**/.vscode/*\n.DS_Store\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "cmake/Makefile",
"diff": "+help:\n... | C++ | Apache License 2.0 | google/or-tools | Add cmake/Makefile to test cmake build and install
- This makefile orchestrate the use of cmake/docker to test cmake
- add cache/ to .gitignore |
261,284 | 06.02.2018 06:11:21 | 28,800 | 5e9268e1c818dd8d98133c60a3c07c1781ace034 | basic support for .netstandard libraries | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.csharp.mk",
"new_path": "makefiles/Makefile.csharp.mk",
"diff": "@@ -25,11 +25,15 @@ endif\n# The generated DLL name. Defaults to Google.OrTools\nCLR_PROTOBUF_DLL_NAME?=Google.Protobuf\nCLR_ORTOOLS_DLL_NAME?=Google.OrTools\n+NETSTANDARD_ORTO... | C++ | Apache License 2.0 | google/or-tools | basic support for .netstandard libraries |
261,225 | 06.02.2018 06:40:08 | 28,800 | 160a1a6f3a5edcdba2cd2f4650e70869733298d3 | Update Makefile.csharp.mk
fix typo | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.csharp.mk",
"new_path": "makefiles/Makefile.csharp.mk",
"diff": "@@ -177,7 +177,7 @@ $(GEN_DIR)/com/google/ortools/properties/AssemblyInfo.cs: \\\n$(COPY) tools$Scsharp$SAssemblyInfo.cs $(GEN_DIR)$Scom$Sgoogle$Sortools$Sproperties\nifdef CLR... | C++ | Apache License 2.0 | google/or-tools | Update Makefile.csharp.mk
fix typo |
261,230 | 06.02.2018 17:33:58 | -3,600 | e06ab7b0398c6c7ca132fa40287b8c6aa352b472 | initial port of python sat/cp_model.py in C# | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/tests/test_sat_model.cs",
"diff": "+// Copyright 2010-2017 Google\n+// Licensed under the Apache License, Version 2.0 (the \"License\");\n+// you may not use this file except in compliance with the License.\n+// You may obtain a copy of... | C++ | Apache License 2.0 | google/or-tools | initial port of python sat/cp_model.py in C# |
261,218 | 07.02.2018 11:17:44 | -3,600 | 27b3b195c796fc42368fc95f151ee935d2d51dca | Update CMake/Makefile | [
{
"change_type": "MODIFY",
"old_path": "cmake/Makefile",
"new_path": "cmake/Makefile",
"diff": "@@ -52,7 +52,8 @@ cache/%/configure.log: cache/%/docker_devel.tar \\\nCMakeLists.txt cmake/external/CMakeLists.txt ortools/*/CMakeLists.txt \\\ncmake/*.cmake cmake/*Config.cmake.in patches\n@docker load -... | C++ | Apache License 2.0 | google/or-tools | Update CMake/Makefile |
261,230 | 07.02.2018 16:47:24 | -3,600 | acbbd2a2f3fd0a398a6e419f051f7321cd1c3bfb | start adding Sat/CpSolver API in C# | [
{
"change_type": "DELETE",
"old_path": "examples/data/vector_packing/vbp/1D_01CSP/cs_cutgen/type01.TEST1.vbp~",
"new_path": null,
"diff": "-2\n-1000 1 1 1 1 1 1 1 1 1 1\n-10\n-164 1 0 0 0 0 0 0 0 0 0 13\n-158 0 1 0 0 0 0 0 0 0 0 13\n-139 0 0 1 0 0 0 0 0 0 0 17\n-135 0 0 0 1 0 0 0 0 0 0 17\n-125 0 0 ... | C++ | Apache License 2.0 | google/or-tools | start adding Sat/CpSolver API in C# |
261,284 | 08.02.2018 01:23:13 | 28,800 | 06843c9e019c1267cd6e4c74564a0bda6582ee80 | create readme for .net standard
update archive makefile to include .netstandard binaries and examples
fix .netstandard version and signing | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.archive.mk",
"new_path": "makefiles/Makefile.archive.mk",
"diff": "@@ -64,6 +64,7 @@ create_dirs:\n$(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Sdiscrete_tomography\n$(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sfsharp\n$(MKDIR) temp$S$(INSTALL_... | C++ | Apache License 2.0 | google/or-tools | create readme for .net standard
update archive makefile to include .netstandard binaries and examples
fix .netstandard version and signing |
261,284 | 08.02.2018 05:41:08 | 28,800 | 6207fbed49441ef65b4c4bf8cacdf90c2b63506e | fix bugs in osx build
create tool to generate signing key when sn.exe is not present
add build info to readme
add DOTNET_INSTALL_PATH to Makefile.local and try to detect | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -74,3 +74,5 @@ build/\ncache/\n**/.vscode/*\n.DS_Store\n+\n+!tools/netstandard/CreateSigningKey/CreateSigningKey.dll\n"
},
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.csharp.mk",
... | C++ | Apache License 2.0 | google/or-tools | fix bugs in osx build
create tool to generate signing key when sn.exe is not present
add build info to readme
add DOTNET_INSTALL_PATH to Makefile.local and try to detect |
261,284 | 08.02.2018 06:10:06 | 28,800 | 2f368aaa604c6be1f45cc428329ba215c27a0ea4 | add sat folder to netstandard library
fix signing key path and target | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -75,4 +75,5 @@ cache/\n**/.vscode/*\n.DS_Store\n-!tools/netstandard/CreateSigningKey/CreateSigningKey.dll\n+tools/netstandard/CreateSigningKey/bin\n+tools/netstandard/CreateSigningKey/obj\n"
},
{
"chan... | C++ | Apache License 2.0 | google/or-tools | add sat folder to netstandard library
fix signing key path and target |
261,243 | 09.02.2018 00:32:07 | 28,800 | 546897992541145c7305221a16cb99e55d8186d1 | Check for F# compiler before compilation only when target is called | [
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "@@ -56,7 +56,7 @@ include $(OR_ROOT)makefiles/Makefile.cpp.mk\ninclude $(OR_ROOT)makefiles/Makefile.python.mk\ninclude $(OR_ROOT)makefiles/Makefile.java.mk\ninclude $(OR_ROOT)makefiles/Makefile.csharp.mk\n-#include $... | C++ | Apache License 2.0 | google/or-tools | Check for F# compiler before compilation only when target is called |
261,230 | 09.02.2018 11:20:32 | -3,600 | fe23341f890e2c78614ca83724225e96991a9cef | fix F# overwriting SIGNING_FLAGS | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.fsharp.mk",
"new_path": "makefiles/Makefile.fsharp.mk",
"diff": "@@ -20,7 +20,7 @@ endif\n# Check for key pair for strong naming\nifdef CLR_KEYFILE\n- SIGNING_FLAGS = $(FLAG_PREFIX)keyfile:$(CLR_KEYFILE)\n+ FS_SIGNING_FLAGS = $(FLAG_PREFIX)k... | C++ | Apache License 2.0 | google/or-tools | fix F# overwriting SIGNING_FLAGS |
261,230 | 09.02.2018 11:20:47 | -3,600 | d80011fcfc2f8af6a11b9d136c91861516a36098 | evaluate expressions in the solver | [
{
"change_type": "MODIFY",
"old_path": "examples/tests/test_sat_model.cs",
"new_path": "examples/tests/test_sat_model.cs",
"diff": "@@ -86,7 +86,6 @@ public class CsTestCpOperator\nCpModel model = new CpModel();\nIntVar v1 = model.NewIntVar(-10, 10, \"v1\");\nIntVar v2 = model.NewIntVar(-10, 10, \"v... | C++ | Apache License 2.0 | google/or-tools | evaluate expressions in the solver |
261,230 | 09.02.2018 15:39:23 | -3,600 | 6391f2cbeee32bef1c0fc3c6f20f405c92398e14 | nurses_sat ported to python, still missing searching for all solutions | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/csharp/nurses_sat.cs",
"diff": "+// Copyright 2010-2017 Google\n+// Licensed under the Apache License, Version 2.0 (the \"License\");\n+// you may not use this file except in compliance with the License.\n+// You may obtain a copy of th... | C++ | Apache License 2.0 | google/or-tools | nurses_sat ported to python, still missing searching for all solutions |
261,230 | 09.02.2018 17:28:03 | -3,600 | 57c12f834bdea9ae14fa12f3d9377ee71bf60497 | improve sat/swig_helper to support director based callbacks; Implement solution callback in C# CpModel; fill in time in solution observer; use callbacks in nurses_sat.cs | [
{
"change_type": "MODIFY",
"old_path": "examples/csharp/nurses_sat.cs",
"new_path": "examples/csharp/nurses_sat.cs",
"diff": "@@ -16,9 +16,26 @@ using System.Collections.Generic;\nusing System.Linq;\nusing Google.OrTools.Sat;\n-public class NursesSat\n+public class NurseSolutionObserver : SolutionCa... | C++ | Apache License 2.0 | google/or-tools | improve sat/swig_helper to support director based callbacks; Implement solution callback in C# CpModel; fill in time in solution observer; use callbacks in nurses_sat.cs |
261,218 | 08.02.2018 16:18:29 | -3,600 | de4e5b3e5e6b2edb9b97dfc56884b2a6d55e5329 | Update CMake UT using Docker | [
{
"change_type": "MODIFY",
"old_path": "cmake/Makefile",
"new_path": "cmake/Makefile",
"diff": "@@ -14,7 +14,7 @@ help:\n.PHONY: help all\nall: build\n-PROJECT := ortools\n+IMAGE := ortools\n#UID := $(shell id -u)\n#GID := $(shell id -g)\n#DOCKER_DEVEL_CMD := docker run --rm -it -v ${PWD}:/project -... | C++ | Apache License 2.0 | google/or-tools | Update CMake UT using Docker |
261,230 | 09.02.2018 18:16:36 | -3,600 | 1502049cfee7d68c2a16123a68aa703817eacf5b | Split CpSolver.cs out of CpModel.cs | [
{
"change_type": "MODIFY",
"old_path": "ortools/com/google/ortools/sat/CpModel.cs",
"new_path": "ortools/com/google/ortools/sat/CpModel.cs",
"diff": "@@ -1050,204 +1050,4 @@ public class CpModel\nprivate Dictionary<long, IntVar> constant_map_;\n}\n-public class CpSolverSolutionCallback : SolutionCal... | C++ | Apache License 2.0 | google/or-tools | Split CpSolver.cs out of CpModel.cs |
261,230 | 09.02.2018 20:10:52 | -3,600 | 2a71cd9b75b65b147fb2ef912b28a58b9df09931 | remove spurrious logging | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/swig_helper.h",
"new_path": "ortools/sat/swig_helper.h",
"diff": "@@ -135,7 +135,6 @@ class SatHelper {\nsat_parameters.ParseFromString(parameters);\nsat_parameters.set_enumerate_all_solutions(true);\nsat_parameters.set_cp_model_presolve(false);\n-... | C++ | Apache License 2.0 | google/or-tools | remove spurrious logging |
261,230 | 10.02.2018 08:54:24 | -3,600 | 17503ac111f8cd88edc407deee18b2bf4a9a3982 | Add BooleanValue on Sat/Python API (solver + callback) | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/python/cp_model.py",
"new_path": "ortools/sat/python/cp_model.py",
"diff": "@@ -1008,6 +1008,18 @@ def EvaluateExpression(expression, solution):\nreturn value\n+def EvaluateBooleanExpression(literal, solution):\n+ \"\"\"Evaluate an boolean expressi... | C++ | Apache License 2.0 | google/or-tools | Add BooleanValue on Sat/Python API (solver + callback) |
261,230 | 12.02.2018 11:36:40 | -3,600 | 8ea92e372e91cf3d9d1b7631cfd422997a83dbbc | remove glpk from knapsack_solver MIP options | [
{
"change_type": "MODIFY",
"old_path": "ortools/algorithms/knapsack_solver.cc",
"new_path": "ortools/algorithms/knapsack_solver.cc",
"diff": "@@ -1143,12 +1143,6 @@ KnapsackSolver::KnapsackSolver(SolverType solver_type,\nMPSolver::CBC_MIXED_INTEGER_PROGRAMMING, solver_name));\nbreak;\n#endif // USE_... | C++ | Apache License 2.0 | google/or-tools | remove glpk from knapsack_solver MIP options |
261,230 | 12.02.2018 11:38:22 | -3,600 | 07a1078e7797b597c9415de07b1975deac3926d9 | change API or LP writer to return util::status | [
{
"change_type": "MODIFY",
"old_path": "ortools/linear_solver/glop_interface.cc",
"new_path": "ortools/linear_solver/glop_interface.cc",
"diff": "#include \"ortools/linear_solver/linear_solver.h\"\n#include \"ortools/lp_data/lp_data.h\"\n#include \"ortools/lp_data/lp_types.h\"\n+#include \"ortools/p... | C++ | Apache License 2.0 | google/or-tools | change API or LP writer to return util::status |
261,230 | 12.02.2018 11:38:54 | -3,600 | 8efc9a59b8230eb33e25464fd773ff519283f84a | add portable proto API | [
{
"change_type": "MODIFY",
"old_path": "ortools/port/proto_utils.h",
"new_path": "ortools/port/proto_utils.h",
"diff": "#ifndef __PORTABLE_PLATFORM__\n#include \"google/protobuf/generated_enum_reflection.h\"\n+#include \"google/protobuf/text_format.h\"\n#endif\n+#include \"ortools/base/port.h\"\n#in... | C++ | Apache License 2.0 | google/or-tools | add portable proto API |
261,230 | 12.02.2018 11:39:16 | -3,600 | a3e6af38a0888975c0a455410428d0061d675092 | remove flow_cost from makefiles | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.gen.mk",
"new_path": "makefiles/Makefile.gen.mk",
"diff": "@@ -1531,7 +1531,6 @@ SAT_DEPS = \\\n$(SRC_DIR)/ortools/sat/disjunctive.h \\\n$(SRC_DIR)/ortools/sat/drat.h \\\n$(SRC_DIR)/ortools/sat/encoding.h \\\n- $(SRC_DIR)/ortools/sat/flow_co... | C++ | Apache License 2.0 | google/or-tools | remove flow_cost from makefiles |
261,230 | 12.02.2018 11:39:56 | -3,600 | 36878edc8029a6849ac253c8ebca8ebdaaef3ba1 | change BitOffset64 API to return uint32 | [
{
"change_type": "MODIFY",
"old_path": "ortools/util/bitset.h",
"new_path": "ortools/util/bitset.h",
"diff": "@@ -326,7 +326,7 @@ inline uint32 IntervalDown32(uint32 s) {\n// corresponding to the bit at position pos in the bitset.\n// Note: '& 63' is faster than '% 64'\n// TODO(user): rename BitPos ... | C++ | Apache License 2.0 | google/or-tools | change BitOffset64 API to return uint32 |
261,230 | 12.02.2018 13:23:32 | -3,600 | b7cf1a453e3283b460cf1add0ffe1cc8a62f2ed1 | Add BooleanValue getter on CPSolver and CpSolverSolutionCallback in C#; use it in nurses_sat.cs solution printer | [
{
"change_type": "MODIFY",
"old_path": "examples/csharp/nurses_sat.cs",
"new_path": "examples/csharp/nurses_sat.cs",
"diff": "@@ -16,14 +16,41 @@ using System.Collections.Generic;\nusing System.Linq;\nusing Google.OrTools.Sat;\n-public class NurseSolutionObserver : SolutionCallback\n+public class Nu... | C++ | Apache License 2.0 | google/or-tools | Add BooleanValue getter on CPSolver and CpSolverSolutionCallback in C#; use it in nurses_sat.cs solution printer |
261,230 | 12.02.2018 14:46:10 | -3,600 | 0e32a5d1cf0370647f22da8741763ba0d081ec52 | regroup sat code for filling statistics in response | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/cp_model_solver.cc",
"new_path": "ortools/sat/cp_model_solver.cc",
"diff": "@@ -2208,6 +2208,22 @@ CpSolverResponse SolveCpModelInternal(\nCpSolverResponse response;\nresponse.set_status(CpSolverStatus::MODEL_INVALID);\n+ auto fill_response_statist... | C++ | Apache License 2.0 | google/or-tools | regroup sat code for filling statistics in response |
261,218 | 12.02.2018 17:17:41 | -3,600 | 66e7fba841cbbc06db799a368e2dc2ac995c8b28 | Fix external patch path.
When incorporating ortools in an existing CMake Project,
${CMAKE_SOURCE_DIR} will point to the wrong directory prefer to
use PROJECT_SOURCE_DIR instead... | [
{
"change_type": "MODIFY",
"old_path": "cmake/external/cbc.CMakeLists.txt",
"new_path": "cmake/external/cbc.CMakeLists.txt",
"diff": "@@ -13,7 +13,7 @@ ExternalProject_Add(cbc_project\nSOURCE_DIR \"${CMAKE_BINARY_DIR}/cbc-src\"\nBINARY_DIR \"${CMAKE_BINARY_DIR}/cbc-build\"\nUPDATE_COMMAND \"\"\n- #P... | C++ | Apache License 2.0 | google/or-tools | Fix external patch path.
When incorporating ortools in an existing CMake Project,
${CMAKE_SOURCE_DIR} will point to the wrong directory prefer to
use PROJECT_SOURCE_DIR instead... |
261,218 | 12.02.2018 17:21:04 | -3,600 | 6a9403a547d823d280bd64539f4d8e3dcccbb9f6 | Fix glog tag so patch can apply | [
{
"change_type": "MODIFY",
"old_path": "cmake/external/glog.CMakeLists.txt",
"new_path": "cmake/external/glog.CMakeLists.txt",
"diff": "@@ -9,7 +9,7 @@ project(glog-download NONE)\ninclude(ExternalProject)\nExternalProject_Add(glog_project\nGIT_REPOSITORY https://github.com/google/glog\n- GIT_TAG \"... | C++ | Apache License 2.0 | google/or-tools | Fix glog tag so patch can apply |
261,230 | 12.02.2018 17:25:37 | -3,600 | 59a48e24a9a859ad922db899fc6bd7f1b821e885 | Add more constraints to C# Sat API | [
{
"change_type": "MODIFY",
"old_path": "ortools/com/google/ortools/sat/CpModel.cs",
"new_path": "ortools/com/google/ortools/sat/CpModel.cs",
"diff": "@@ -26,7 +26,7 @@ public class CpModel\npublic CpModel()\n{\nmodel_ = new CpModelProto();\n- constant_map_ = new Dictionary<long, IntVar>();\n+ consta... | C++ | Apache License 2.0 | google/or-tools | Add more constraints to C# Sat API |
261,243 | 13.02.2018 00:00:34 | 28,800 | 942509859830cc19b4b850cadaf3e5ded7254035 | Add constraint programming examples | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/fsharp/diet.fsx",
"diff": "+(*\n+\n+ Copyright 2012 Hakan Kjellerstrand\n+\n+ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ you may not use this file except in compliance with the License.\n+ You may obtain a copy... | C++ | Apache License 2.0 | google/or-tools | Add constraint programming examples |
261,218 | 13.02.2018 15:01:10 | -3,600 | c97bb82bf9c1d7e20235da2ec00562f454683f84 | Only add ortools as CMake subproject if target not found
Should fix error if a super build already has some | [
{
"change_type": "MODIFY",
"old_path": "CMakeLists.txt",
"new_path": "CMakeLists.txt",
"diff": "@@ -54,7 +54,7 @@ message(STATUS \"Build Python Binding: ${BUILD_PYTHON}\")\nmessage(STATUS \"Build Java Binding: ${BUILD_JAVA}\")\nmessage(STATUS \"Build CSharp Binding: ${BUILD_CSHARP}\")\n-# Build Depe... | C++ | Apache License 2.0 | google/or-tools | Only add ortools as CMake subproject if target not found
Should fix error if a super build already has some |
261,218 | 13.02.2018 15:02:13 | -3,600 | eb9baf0ffac4b830bcb0afcf380c5a3e07b3c853 | Add swig to windows only if we build python, java or csharp | [
{
"change_type": "MODIFY",
"old_path": "cmake/external/CMakeLists.txt",
"new_path": "cmake/external/CMakeLists.txt",
"diff": "@@ -17,8 +17,8 @@ set(BUILD_TESTING OFF)\n####################\n## SWIG (WIN32) ##\n####################\n-if(WIN32)\n- message(STATUS \"Subproject: Swig...\")\n+if(WIN32 AND... | C++ | Apache License 2.0 | google/or-tools | Add swig to windows only if we build python, java or csharp |
261,230 | 13.02.2018 17:30:43 | -3,600 | 7d599039f925d53ef77e5132d26ed338ba933e98 | misc improvement on sat python API; enrich sat swig helper; rewrote CpSolver.cs to follow change in SWIG | [
{
"change_type": "MODIFY",
"old_path": "ortools/com/google/ortools/sat/CpModel.cs",
"new_path": "ortools/com/google/ortools/sat/CpModel.cs",
"diff": "@@ -49,11 +49,14 @@ public class CpModel\nreturn new IntVar(model_, bounds, name);\n}\n- public IntVar NewIntVar(IEnumerable<long> bounds, string name... | C++ | Apache License 2.0 | google/or-tools | misc improvement on sat python API; enrich sat swig helper; rewrote CpSolver.cs to follow change in SWIG |
261,230 | 14.02.2018 15:00:12 | -3,600 | 9bf0c781ad1072407af139927171c3e023f30ce6 | add more constraints to C# SAT | [
{
"change_type": "MODIFY",
"old_path": "ortools/com/google/ortools/sat/CpModel.cs",
"new_path": "ortools/com/google/ortools/sat/CpModel.cs",
"diff": "@@ -321,9 +321,33 @@ public class CpModel\nreturn ct;\n}\n- // TODO: AddAllowedAssignments\n+ public Constraint AddAllowedAssignments(IEnumerable<IntV... | C++ | Apache License 2.0 | google/or-tools | add more constraints to C# SAT |
261,230 | 16.02.2018 14:01:56 | -3,600 | 4d03d6eb295c319cec3a9de64b4131762f13c28e | fix bug in cp_model.py#AddAutomata | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/python/cp_model.py",
"new_path": "ortools/sat/python/cp_model.py",
"diff": "@@ -677,8 +677,8 @@ class CpModel(object):\nAssertIsInt64(t[1])\nAssertIsInt64(t[2])\nmodel_ct.automata.transition_head.append(t[0])\n- model_ct.automata.transition_label.a... | C++ | Apache License 2.0 | google/or-tools | fix bug in cp_model.py#AddAutomata |
261,230 | 16.02.2018 15:59:22 | -3,600 | b75ad825104d736469d5d2c777a2c4d63bb2c8c3 | add missing integer constraints in C#/SAT CpModel.cs | [
{
"change_type": "MODIFY",
"old_path": "ortools/com/google/ortools/sat/CpModel.cs",
"new_path": "ortools/com/google/ortools/sat/CpModel.cs",
"diff": "@@ -136,6 +136,68 @@ public class CpModel\nreturn ct;\n}\n+ public Constraint AddLinearConstraintWithBounds(\n+ IEnumerable<Tuple<IntVar, long>> terms... | C++ | Apache License 2.0 | google/or-tools | add missing integer constraints in C#/SAT CpModel.cs |
261,230 | 16.02.2018 17:08:31 | -3,600 | 41a6c64be66ddc879bd0a7e597c7704cf6053dde | finish C$ Sat Integer API; Refactor Glop code; Add new option for Glop Scaling; speed improvements in the sat solver | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "ortools/lp_data/lp_data_utils.cc",
"diff": "+// Copyright 2010-2017 Google\n+// Licensed under the Apache License, Version 2.0 (the \"License\");\n+// you may not use this file except in compliance with the License.\n+// You may obtain a copy of... | C++ | Apache License 2.0 | google/or-tools | finish C$ Sat Integer API; Refactor Glop code; Add new option for Glop Scaling; speed improvements in the sat solver |
261,230 | 19.02.2018 12:58:09 | -3,600 | d3bd654c287f8287cd83994f35bcff1d9144e595 | export all SAT/C# API in swig_helper | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/csharp/sat.i",
"new_path": "ortools/sat/csharp/sat.i",
"diff": "@@ -62,13 +62,17 @@ PROTO2_RETURN(\n%feature(\"director\") operations_research::sat::SolutionCallback;\n%unignore operations_research::sat::SolutionCallback;\n-%unignore operations_res... | C++ | Apache License 2.0 | google/or-tools | export all SAT/C# API in swig_helper |
261,230 | 19.02.2018 15:57:19 | -3,600 | 9dfbd08c9f853ccc88c346b5e3f1fc464f3a135b | finish C# Sat API; first jobshop example; Add sat in test_csharp | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/csharp/jobshop_ft06_sat.cs",
"diff": "+// Copyright 2010-2017 Google\n+// Licensed under the Apache License, Version 2.0 (the \"License\");\n+// you may not use this file except in compliance with the License.\n+// You may obtain a copy... | C++ | Apache License 2.0 | google/or-tools | finish C# Sat API; first jobshop example; Add sat in test_csharp |
261,230 | 19.02.2018 16:41:56 | -3,600 | 1a5a0c8c855116b23ae802e1da2454d76ff1666f | improve jobshop_ft06_sat.cs code | [
{
"change_type": "MODIFY",
"old_path": "examples/csharp/jobshop_ft06_sat.cs",
"new_path": "examples/csharp/jobshop_ft06_sat.cs",
"diff": "@@ -18,6 +18,21 @@ using Google.OrTools.Sat;\npublic class JobshopFt06Sat\n{\n+\n+ public struct Task\n+ {\n+ public Task(IntVar s, IntVar e, IntervalVar i)\n+ {\... | C++ | Apache License 2.0 | google/or-tools | improve jobshop_ft06_sat.cs code |
261,230 | 20.02.2018 16:35:04 | -3,600 | bf5825169160d02c16787e0f9ba058689134c51f | allow override python version when creating the Makefile.local | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.port.mk",
"new_path": "makefiles/Makefile.port.mk",
"diff": "@@ -13,7 +13,7 @@ endif\nifeq (\"$(SYSTEM)\",\"unix\")\nOR_TOOLS_TOP ?= $(shell pwd)\nOS = $(shell uname -s)\n- DETECTED_PYTHON_VERSION = $(shell python -c \"from sys import versio... | C++ | Apache License 2.0 | google/or-tools | allow override python version when creating the Makefile.local |
261,218 | 20.02.2018 16:46:39 | -3,600 | d2125822843d1a0fbd660ce89740f3261d418f08 | Use UNIX_PYTHON_VER to override python version when creating the Makefile.local | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.port.mk",
"new_path": "makefiles/Makefile.port.mk",
"diff": "@@ -13,7 +13,11 @@ endif\nifeq (\"$(SYSTEM)\",\"unix\")\nOR_TOOLS_TOP ?= $(shell pwd)\nOS = $(shell uname -s)\n- DETECTED_PYTHON_VERSION ?= $(shell python -c \"from sys import vers... | C++ | Apache License 2.0 | google/or-tools | Use UNIX_PYTHON_VER to override python version when creating the Makefile.local |
261,218 | 20.02.2018 14:28:13 | -3,600 | e437c41809176f77dbebd7e436f124b4cafa4486 | make third_party more quiet
This is mandatory for Travis-CI otherwise logs are too big (i.e. > 4MB) | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "makefiles/Makefile.third_party.unix.mk",
"diff": "@@ -185,7 +185,7 @@ dependencies/sources/gflags-$(GFLAGS_TAG)/build_cmake/Makefile: dependencies/sou\n..\ndependencies/sources/gflags-$(GFLAGS_TAG)/CMakeLis... | C++ | Apache License 2.0 | google/or-tools | make third_party more quiet
- This is mandatory for Travis-CI otherwise logs are too big (i.e. > 4MB) |
261,218 | 20.02.2018 14:39:27 | -3,600 | 89265fe15c6e77e80a038980e0a288f0e7178217 | create dependencies/[install|archives] directories if needed | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "makefiles/Makefile.third_party.unix.mk",
"diff": "@@ -22,6 +22,8 @@ third_party: makefile_third_party install_third_party\n# Create missing directories\nMISSING_DIRECTORIES = \\\n+ dependencies/install \\\n... | C++ | Apache License 2.0 | google/or-tools | create dependencies/[install|archives] directories if needed |
261,218 | 20.02.2018 14:32:31 | -3,600 | 6d15a2412612ea84576705b2a4ca0484f6a9d1b6 | Disable Cbc warning
Currently Cbc output too much error on Travis-CI leading to crashing jobs
since logs are too big.
The workaround is to ignore Cbc warnings adding "-w" to CXX_FLAGS | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "makefiles/Makefile.third_party.unix.mk",
"diff": "@@ -62,10 +62,10 @@ missing_directories: $(MISSING_DIRECTORIES)\ninstall_third_party: \\\nmissing_directories \\\n+ install_cbc \\\ninstall_gflags \\\n- ins... | C++ | Apache License 2.0 | google/or-tools | Disable Cbc warning
Currently Cbc output too much error on Travis-CI leading to crashing jobs
since logs are too big.
The workaround is to ignore Cbc warnings adding "-w" to CXX_FLAGS |
261,218 | 20.02.2018 11:12:07 | -3,600 | 269f8316ebb22bc7232325551c9b7a1c631b9582 | rework travis-ci
add rules for Makefile cc build on linux & osx
add rules for CMake build on linux & osx | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "sudo: required\n+language: generic\n+\n+matrix:\n+ include:\n+# Makefile builder\n+ - os: linux\ndist: trusty\nlanguage: cpp\n+ compiler: gcc\n+ env: BUILDER=make DISTRO=native LANGUAGE=cc\n-os:\n- - linux\n- -... | C++ | Apache License 2.0 | google/or-tools | rework travis-ci
- add rules for Makefile cc build on linux & osx
- add rules for CMake build on linux & osx |
261,218 | 20.02.2018 13:07:09 | -3,600 | fa33c59b6e1bb9072c0af456ba5425bc49ee2207 | Add Makefile Python CI test | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -9,11 +9,20 @@ matrix:\nlanguage: cpp\ncompiler: gcc\nenv: BUILDER=make DISTRO=native LANGUAGE=cc\n+ - os: linux\n+ dist: trusty\n+ language: cpp\n+ compiler: gcc\n+ env: BUILDER=make DISTRO=native LANGUAGE=... | C++ | Apache License 2.0 | google/or-tools | Add Makefile Python CI test |
261,218 | 20.02.2018 16:13:00 | -3,600 | 852a4b031b8ece3c4b429fabd28c3e07d35937b1 | Add Travis-CI support for java and csharp | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -14,6 +14,16 @@ matrix:\nlanguage: cpp\ncompiler: gcc\nenv: BUILDER=make DISTRO=native LANGUAGE=python\n+ - os: linux\n+ dist: trusty\n+ language: cpp\n+ compiler: gcc\n+ env: BUILDER=make DISTRO=native LANG... | C++ | Apache License 2.0 | google/or-tools | Add Travis-CI support for java and csharp |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.