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,243 | 10.09.2017 22:28:03 | 25,200 | 75ff975920ab512e00a51043d1c43477b4283545 | Add integer programming example. Add types for solver algorithms | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/fsharp/Google.OrTools.FSharp.fsx",
"diff": "+namespace Google.OrTools.FSharp\n+\n+\n+type LinearProgramming =\n+ // Linear Programming\n+ | CLP // Recommended default value.\n+ | GLPK\n+ | GLOP\n+ | GUROBI\n+ | CPLEX\n+ override this.To... | C++ | Apache License 2.0 | google/or-tools | Add integer programming example. Add types for solver algorithms |
261,230 | 11.09.2017 13:12:27 | -7,200 | 139596bb3fbe2d5794ac43afc06d7cdf989f04b8 | revamp internal of simplex connection inside sat | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/cp_model_presolve.cc",
"new_path": "ortools/sat/cp_model_presolve.cc",
"diff": "@@ -387,6 +387,7 @@ bool PresolveBoolOr(ConstraintProto* ct, PresolveContext* context) {\n// used in any other constraint (note that we artifically bump the\n// objecti... | C++ | Apache License 2.0 | google/or-tools | revamp internal of simplex connection inside sat |
261,230 | 11.09.2017 13:12:43 | -7,200 | 06dcefa8e3ffd44d02ca1e50b3bb078047abdf8c | use sat backend for fz by default | [
{
"change_type": "MODIFY",
"old_path": "ortools/flatzinc/fz.cc",
"new_path": "ortools/flatzinc/fz.cc",
"diff": "@@ -65,7 +65,7 @@ DEFINE_bool(\nverbose_impact, false,\n\"Increase verbosity of the impact based search when used in free search.\");\nDEFINE_bool(verbose_mt, false, \"Verbose Multi-Thread... | C++ | Apache License 2.0 | google/or-tools | use sat backend for fz by default |
261,230 | 11.09.2017 15:45:25 | -7,200 | e4c76969895d5551327447c2a270d5b6582d3072 | Export F# examples in archive | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.archive.mk",
"new_path": "makefiles/Makefile.archive.mk",
"diff": "@@ -61,6 +61,8 @@ create_dirs:\n$(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Ssurvo_puzzle\n$(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Squasigroup_completion\n$(MKDIR) te... | C++ | Apache License 2.0 | google/or-tools | Export F# examples in archive |
261,230 | 11.09.2017 18:35:39 | -7,200 | 3ef574a167662567e9d3183a99f4741da9b6aaf4 | fix docker manylinux | [
{
"change_type": "MODIFY",
"old_path": "tools/docker/build-manylinux1.sh",
"new_path": "tools/docker/build-manylinux1.sh",
"diff": "@@ -55,6 +55,7 @@ function export_manylinux_wheel {\n# We need to force this target, otherwise the protobuf stub will be missing\n# (for the makefile, it exists even if... | C++ | Apache License 2.0 | google/or-tools | fix docker manylinux |
261,230 | 12.09.2017 13:17:48 | -7,200 | 2aa7df3baeeea0885d7cbd4b0da7060ea6c22d75 | fix protobuf.jar to contains .class files, instead of .java files | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "makefiles/Makefile.third_party.unix.mk",
"diff": "@@ -15,7 +15,7 @@ ifeq ($(PLATFORM), MACOSX)\nendif\n# Main target.\n-.PHONY: makefile_third_party missing_directories install_java_protobuf\n+.PHONY: makef... | C++ | Apache License 2.0 | google/or-tools | fix protobuf.jar to contains .class files, instead of .java files |
261,230 | 12.09.2017 20:36:21 | -7,200 | bf0891b930d63aaade52cc4468a69692f27c541f | stop building egg file on win/mac | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.python.mk",
"new_path": "makefiles/Makefile.python.mk",
"diff": "@@ -323,10 +323,10 @@ endif\npypi_upload: pypi_archive\n@echo Uploading Pypi module for $(PYTHON_EXECUTABLE).\nifeq ($(SYSTEM),win)\n- cd $(PYPI_ARCHIVE_TEMP_DIR)\\ortools && $... | C++ | Apache License 2.0 | google/or-tools | stop building egg file on win/mac |
261,243 | 14.09.2017 00:26:46 | 25,200 | 1bf14715956e481ef802d455c85b8c33c85fb166 | Adding volsay example | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/fsharp/volsay.fsx",
"diff": "+//\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 obta... | C++ | Apache License 2.0 | google/or-tools | Adding volsay example |
261,230 | 21.09.2017 07:53:30 | -7,200 | 27fcdf71a1e9baac7a1f0738eb7d4578e51d0147 | fix python version, again | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.python.mk",
"new_path": "makefiles/Makefile.python.mk",
"diff": "@@ -280,7 +280,7 @@ $(PYPI_ARCHIVE_TEMP_DIR) : $(OR_TOOLS_PYTHON_GEN_SCRIPTS)\n$(COPY) ortools$Sgen$Sortools$Salgorithms$Spywrapknapsack_solver.py $(PYPI_ARCHIVE_TEMP_DIR)$Sort... | C++ | Apache License 2.0 | google/or-tools | fix python version, again |
261,243 | 25.09.2017 12:00:16 | 25,200 | 9e8c275e71c61cefbae501ade97ca7cfed8a09c7 | Example using matrices | [
{
"change_type": "MODIFY",
"old_path": "examples/fsharp/README.md",
"new_path": "examples/fsharp/README.md",
"diff": "@@ -8,6 +8,6 @@ Be sure to compile the or-tools before executing following\n```shell\nfsharpc --target:exe --out:bin/<example_file>.exe --platform:anycpu --lib:bin -r:Google.OrTools.... | C++ | Apache License 2.0 | google/or-tools | Example using matrices |
261,243 | 27.09.2017 13:33:00 | 25,200 | 367658f3a03636cd4a875ff070e0a8ef5a32691c | Add function for linear solver with associated types | [
{
"change_type": "MODIFY",
"old_path": "README",
"new_path": "README",
"diff": "@@ -18,6 +18,7 @@ or-tools/\nexamples/csharp/ <- C# examples\nexamples/data/ <- Data files for examples\nexamples/flatzinc/ <- Flatzinc examples\n+ examples/fsharp/ <- F# examples\nexamples/python/ <- Python examples\nex... | C++ | Apache License 2.0 | google/or-tools | Add function for linear solver with associated types |
261,243 | 28.09.2017 00:14:48 | 25,200 | 1e7d9ef7b894ba2287bb64584cb60aaa7df9d48a | Add better error handling for lpSolve inputs | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/fsharp/equality.fsx",
"diff": "+(*\n+ Minimize: 2 * x[0] + 1 * x[1]\n+\n+ Subject to: 3 * x[0] + 1 * x[1] - 1 * x[2] = 3\n+ 4 * x[0] + 3 * x[1] - 1 * x[3] = 6\n+ 1 * x[0] + 2 * x[1] - 1 * x[4] = 2\n+\n+ And x[j] >= 0 for j in [0..4]\n+\... | C++ | Apache License 2.0 | google/or-tools | Add better error handling for lpSolve inputs |
261,243 | 28.09.2017 19:48:02 | 25,200 | 3435a23fed90335494d104d821898cf0b68036b4 | Add method to take result and print summary | [
{
"change_type": "MODIFY",
"old_path": "examples/fsharp/equality.fsx",
"new_path": "examples/fsharp/equality.fsx",
"diff": "@@ -25,7 +25,7 @@ open System\nopen Google.OrTools.FSharp\nopen Google.OrTools.LinearSolver\n-let opts = defaultSolverOpts\n+let opts = SolverOpts.Default\n.Name(\"Equality Con... | C++ | Apache License 2.0 | google/or-tools | Add method to take result and print summary |
261,243 | 28.09.2017 22:21:20 | 25,200 | bb3ec00b0b40afc4e966c421f7ff8dc13bee2493 | Handle Integer Program. Compare to Linear Program. | [
{
"change_type": "MODIFY",
"old_path": "examples/fsharp/README.md",
"new_path": "examples/fsharp/README.md",
"diff": "Examples from the or-tools library utilizing F#\n+## SolverOptions and lpSolve\n+This function and parameter object are a wrapper around the standard or-tools functions. It is design... | C++ | Apache License 2.0 | google/or-tools | Handle Integer Program. Compare to Linear Program. |
261,230 | 29.09.2017 16:33:02 | -7,200 | bc46de013ff6f806d45a05680074ff39e22952ca | python wrapper around sat cp_model | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/tests/cp_model_test.py",
"diff": "+\"\"\"Tests for ortools.sat.python.cp_model.\"\"\"\n+\n+from __future__ import absolute_import\n+from __future__ import division\n+from __future__ import print_function\n+\n+from ortools.sat import cp_... | C++ | Apache License 2.0 | google/or-tools | python wrapper around sat cp_model |
261,230 | 01.10.2017 16:25:50 | -7,200 | 8752053693ca681393d04f3c9ded6c9b1bdb35dc | python sat files | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "ortools/sat/__init__.py",
"diff": "+# Copyright 2010-2014 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 the License ... | C++ | Apache License 2.0 | google/or-tools | python sat files |
261,230 | 01.10.2017 16:54:41 | -7,200 | 8f759d2324c70975c6186b827317cadddd4e6b70 | fix sat python | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.python.mk",
"new_path": "makefiles/Makefile.python.mk",
"diff": "@@ -230,7 +230,7 @@ $(GEN_DIR)/ortools/sat/pywrapsat.py: \\\n$(GEN_DIR)/ortools/sat/cp_model_pb2.py \\\n$(GEN_DIR)/ortools/sat/sat_parameters_pb2.py \\\n$(SAT_DEPS)\n- $(SWIG_B... | C++ | Apache License 2.0 | google/or-tools | fix sat python |
261,230 | 02.10.2017 14:09:48 | -7,200 | d48958689e0e7094c2d26af517d96c1c327fc6cc | clean up docker; remove py3- module prefix | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.python.mk",
"new_path": "makefiles/Makefile.python.mk",
"diff": "@@ -335,11 +335,7 @@ endif\n$(COPY) tools$SREADME.pypi $(PYPI_ARCHIVE_TEMP_DIR)$Sortools$SREADME.txt\n$(COPY) LICENSE-2.0.txt $(PYPI_ARCHIVE_TEMP_DIR)$Sortools\n$(COPY) tools$S... | C++ | Apache License 2.0 | google/or-tools | clean up docker; remove py3- module prefix |
261,230 | 02.10.2017 14:41:12 | -7,200 | 09516b7900f47c41c315aa4661b6464ddabd7fb7 | small cleanup of the build script on mac | [
{
"change_type": "MODIFY",
"old_path": "tools/build_delivery_mac.sh",
"new_path": "tools/build_delivery_mac.sh",
"diff": "@@ -8,13 +8,14 @@ echo Running tests\nmake test UNIX_PYTHON_VER=2.7\necho Creating standard artifacts.\nmake python_examples_archive archive fz_archive pypi_upload UNIX_PYTHON_VE... | C++ | Apache License 2.0 | google/or-tools | small cleanup of the build script on mac |
261,230 | 02.10.2017 15:25:53 | -7,200 | ae8fa98dbac80da9e6f519278ee5e035f6a0434b | cleanup python modules, makefiles | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.python.mk",
"new_path": "makefiles/Makefile.python.mk",
"diff": "@@ -373,20 +373,6 @@ else\nendif\ncd $(PYPI_ARCHIVE_TEMP_DIR)/ortools && twine upload dist/*\n-pypi_export: pypi_archive # to be used in docker (linux only).\n- @echo Exporting... | C++ | Apache License 2.0 | google/or-tools | cleanup python modules, makefiles |
261,230 | 02.10.2017 15:44:38 | -7,200 | 9dfc523318a93868a96ab793af95c5a5c38a0ad7 | fix F# archive | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.archive.mk",
"new_path": "makefiles/Makefile.archive.mk",
"diff": "@@ -62,6 +62,7 @@ create_dirs:\n$(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Squasigroup_completion\n$(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata$Sdiscrete_tomography\n$(MK... | C++ | Apache License 2.0 | google/or-tools | fix F# archive |
261,230 | 02.10.2017 14:55:51 | 0 | 21e9bc0768e9686d27ebd9d736033dc69701fc48 | fix build script on windows | [
{
"change_type": "MODIFY",
"old_path": "tools/build_delivery_win.cmd",
"new_path": "tools/build_delivery_win.cmd",
"diff": "@@ -6,10 +6,10 @@ echo Running tests\ntools\\make.exe test\necho Creating standard artifacts.\ntools\\rm -rf temp-python27\n-tools\\make.exe python_examples_archive archive fz_... | C++ | Apache License 2.0 | google/or-tools | fix build script on windows |
261,230 | 02.10.2017 16:57:02 | -7,200 | a2eb8279dce85aa6874a900bbc235bbbcf9830ac | make the build script on mac more robust | [
{
"change_type": "MODIFY",
"old_path": "tools/build_delivery_mac.sh",
"new_path": "tools/build_delivery_mac.sh",
"diff": "@@ -7,14 +7,17 @@ make all fz -j 5 UNIX_PYTHON_VER=2.7\necho Running tests\nmake test UNIX_PYTHON_VER=2.7\necho Creating standard artifacts.\n+rm -rf temp-python*\nmake python_ex... | C++ | Apache License 2.0 | google/or-tools | make the build script on mac more robust |
261,230 | 02.10.2017 18:45:04 | -7,200 | f0407a8c668b742224937a5a03582730067d3d74 | fix stupid crash | [
{
"change_type": "MODIFY",
"old_path": "ortools/flatzinc/presolve.cc",
"new_path": "ortools/flatzinc/presolve.cc",
"diff": "@@ -2490,6 +2490,10 @@ Presolver::RuleStatus Presolver::PresolveBoolXor(Constraint* ct, std::string* lo\n// Input : bool_not(b1, b2)\n// Output: bool_not(b1, b2) => b2 if b2 is... | C++ | Apache License 2.0 | google/or-tools | fix stupid crash |
261,230 | 03.10.2017 10:55:18 | -7,200 | 49859e09dcd40c2cdb57a37bce7174ebc11fc3d1 | better fix of presolve bug | [
{
"change_type": "MODIFY",
"old_path": "ortools/flatzinc/presolve.cc",
"new_path": "ortools/flatzinc/presolve.cc",
"diff": "@@ -2489,10 +2489,15 @@ Presolver::RuleStatus Presolver::PresolveBoolXor(Constraint* ct, std::string* lo\n// Rule 4:\n// Input : bool_not(b1, b2)\n// Output: bool_not(b1, b2) =... | C++ | Apache License 2.0 | google/or-tools | better fix of presolve bug |
261,243 | 03.10.2017 10:52:33 | 25,200 | 794f1696e14cd12f4342076c60c36d1de23402f2 | Name refactoriing. Adding comments for intellisense in some editors | [
{
"change_type": "MODIFY",
"old_path": "examples/fsharp/equality-inequality.fsx",
"new_path": "examples/fsharp/equality-inequality.fsx",
"diff": "@@ -33,8 +33,8 @@ let opts = SolverOpts.Default\n.Objective([-3.0;1.0;1.0;0.0;0.0])\n.MatrixEq([[1.0;-4.0;-2.0]; [-2.0;1.0;0.0]; [1.0;2.0;1.0]; [1.0;0.0;0... | C++ | Apache License 2.0 | google/or-tools | Name refactoriing. Adding comments for intellisense in some editors |
261,243 | 06.10.2017 16:42:19 | 25,200 | dea555b7a3e031ce5c00090ec398225287118d8a | More clear names for functions | [
{
"change_type": "MODIFY",
"old_path": "examples/fsharp/equality-inequality.fsx",
"new_path": "examples/fsharp/equality-inequality.fsx",
"diff": "@@ -33,8 +33,8 @@ let opts = SolverOpts.Default\n.Objective([-3.0;1.0;1.0;0.0;0.0])\n.MatrixEq([[1.0;-4.0;-2.0]; [-2.0;1.0;0.0]; [1.0;2.0;1.0]; [1.0;0.0;0... | C++ | Apache License 2.0 | google/or-tools | More clear names for functions |
261,230 | 09.10.2017 07:54:07 | 25,200 | 9a5ea9f2deb6795209c26c98aed2eb801e646176 | hard code int64 min/max in the python sat wrapper | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/python/cp_model.py",
"new_path": "ortools/sat/python/cp_model.py",
"diff": "@@ -32,8 +32,8 @@ from ortools.sat import pywrapsat\n# usual arithmetic operators +-*/ and with constant numbers, which makes the\n# python API very intuitive. See cp_model... | C++ | Apache License 2.0 | google/or-tools | hard code int64 min/max in the python sat wrapper |
261,230 | 09.10.2017 20:25:22 | -7,200 | f4f0b5166c28c86071709814541877bebf8ebc8e | sort makefiles/Makefile.gen.mk | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.gen.mk",
"new_path": "makefiles/Makefile.gen.mk",
"diff": "@@ -5,8 +5,8 @@ BASE_DEPS = \\\n$(SRC_DIR)/ortools/base/casts.h \\\n$(SRC_DIR)/ortools/base/file.h \\\n$(SRC_DIR)/ortools/base/inlined_vector.h \\\n- $(SRC_DIR)/ortools/base/int_type... | C++ | Apache License 2.0 | google/or-tools | sort makefiles/Makefile.gen.mk |
261,230 | 09.10.2017 17:19:33 | 25,200 | 48837ce11f2515c40c0ae5d23582589ec94e2aa0 | Assignment -> Assignments in cp_model.py | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/boolean_problem.cc",
"new_path": "ortools/sat/boolean_problem.cc",
"diff": "#include \"ortools/base/integral_types.h\"\n#include \"ortools/base/logging.h\"\n#include \"ortools/base/stringprintf.h\"\n+#include \"ortools/graph/io.h\"\n+#include \"ort... | C++ | Apache License 2.0 | google/or-tools | Assignment -> Assignments in cp_model.py |
261,230 | 11.10.2017 03:05:13 | 25,200 | 20ba8015bca8bc18231d47a4cc2dcac03d224132 | fix sat bugs found by new examples; improve gitignore | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -27,8 +27,9 @@ lib/\nexamples/csharp/solution/*.csproj\nexamples/csharp/*.sln\n-src/bazel-*\n+ortools/bazel-*\nexamples/bazel-*\n+bazel-*\ntools/docker/export\n"
},
{
"change_type": "ADD",
"old_pat... | C++ | Apache License 2.0 | google/or-tools | fix sat bugs found by new examples; improve gitignore |
261,230 | 15.10.2017 14:36:41 | -7,200 | 3735e730318773876541ff02d7629fc69948d946 | add dependencies on six for ortools pypi module | [
{
"change_type": "MODIFY",
"old_path": "tools/setup.py",
"new_path": "tools/setup.py",
"diff": "@@ -36,7 +36,9 @@ setup(\n'ortools.linear_solver',],\next_modules = [dummy_module],\ninstall_requires = [\n- 'protobuf == PROTOBUF_TAG'],\n+ 'protobuf == PROTOBUF_TAG',\n+ 'six >= 1.10',\n+ ],\npackage_da... | C++ | Apache License 2.0 | google/or-tools | add dependencies on six for ortools pypi module |
261,230 | 15.10.2017 14:39:49 | -7,200 | 4bea1f992228d517e9eb721307400fcb1e9abc2c | improve hidato_sat.py | [
{
"change_type": "MODIFY",
"old_path": "examples/python/hidato_sat.py",
"new_path": "examples/python/hidato_sat.py",
"diff": "@@ -50,11 +50,7 @@ def PrintMatrix(game):\nprint(line)\n-def SolveHidato(problem):\n- \"\"\"Solve the given hidato table.\"\"\"\n- # Create the model.\n- model = cp_model.CpM... | C++ | Apache License 2.0 | google/or-tools | improve hidato_sat.py |
261,230 | 16.10.2017 15:02:51 | -7,200 | a54b49ebb889f59dd8af88a2b79d793aaf464898 | change solution observer on sat to take a CpSolverResponse as parameter | [
{
"change_type": "MODIFY",
"old_path": "examples/cpp/weighted_tardiness_sat.cc",
"new_path": "examples/cpp/weighted_tardiness_sat.cc",
"diff": "@@ -173,7 +173,7 @@ void Solve(const std::vector<int>& durations, const std::vector<int>& due_dates,\n// Optional preprocessing: add precedences that don't ... | C++ | Apache License 2.0 | google/or-tools | change solution observer on sat to take a CpSolverResponse as parameter |
261,230 | 17.10.2017 11:42:24 | -7,200 | 2152b57799fc0cefc0d32801e62278a7b13ae952 | gate scheduling problem | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/python/gate_scheduling_sat.py",
"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 | gate scheduling problem |
261,230 | 17.10.2017 11:58:29 | -7,200 | c12423004f9b98d9e0133212e12dace267803eee | improve output of gate scheduling | [
{
"change_type": "MODIFY",
"old_path": "examples/python/gate_scheduling_sat.py",
"new_path": "examples/python/gate_scheduling_sat.py",
"diff": "# See the License for the specific language governing permissions and\n# limitations under the License.\n+\"\"\"Gate Scheduling problem.\n+\n+We have a set ... | C++ | Apache License 2.0 | google/or-tools | improve output of gate scheduling |
261,230 | 17.10.2017 14:15:44 | -7,200 | 5f6096d901f06e9d2fd126b956517ad997373ae3 | add more API on cp_model.py; gate_scheduling sat problem from or-tools.discuss | [
{
"change_type": "MODIFY",
"old_path": "examples/python/gate_scheduling_sat.py",
"new_path": "examples/python/gate_scheduling_sat.py",
"diff": "@@ -69,15 +69,20 @@ def main():\ndemands.append(jobs[i][1])\nperformed_on_m0 = model.NewBoolVar('perform_%i_on_m0' % i)\n+\nperformed.append(performed_on_m0... | C++ | Apache License 2.0 | google/or-tools | add more API on cp_model.py; gate_scheduling sat problem from or-tools.discuss |
261,230 | 18.10.2017 15:19:19 | -7,200 | cf867ccca74c92e1946f599dc6c94a87a1f54eeb | add no cycle cuts to the lp relaxation in the vrp tour constraint inside the sat solver | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/cp_model_solver.cc",
"new_path": "ortools/sat/cp_model_solver.cc",
"diff": "@@ -1838,6 +1838,26 @@ void TryToAddCutGenerators(const CpModelProto& model_proto,\nnum_nodes - ignore_zero_offset, tails, heads, vars);\ncut_generators->push_back(std::mov... | C++ | Apache License 2.0 | google/or-tools | add no cycle cuts to the lp relaxation in the vrp tour constraint inside the sat solver |
261,230 | 23.10.2017 10:19:56 | -7,200 | c40080b72625fbe0d6363c909e8b041dd67582c7 | Add Implication to cp_model.py | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/python/cp_model.py",
"new_path": "ortools/sat/python/cp_model.py",
"diff": "@@ -614,6 +614,14 @@ class CpModel(object):\n[self.GetOrMakeIndex(x) for x in inverse_variables])\nreturn ct\n+ def AddImplication(self, a, b):\n+ \"\"\"Adds a => b.\"\"\"\... | C++ | Apache License 2.0 | google/or-tools | Add Implication to cp_model.py |
261,230 | 23.10.2017 10:20:17 | -7,200 | c0bad3d49f9cee2bf1e314b39b178e492f39ec2f | speedup sat-lp connection | [
{
"change_type": "MODIFY",
"old_path": "ortools/glop/revised_simplex.h",
"new_path": "ortools/glop/revised_simplex.h",
"diff": "// s1 is an m1-vector (m1 being the height of A1),\n// s2 is an m2-vector (m2 being the height of A2).\n//\n-// See Design Document at\n-// or search for \"Google Linear Pr... | C++ | Apache License 2.0 | google/or-tools | speedup sat-lp connection |
261,230 | 23.10.2017 10:20:37 | -7,200 | 7a1cae89f827da02cecfc0092220479cc19e0f37 | support Fedora lib64 protobuf install path | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.unix.mk",
"new_path": "makefiles/Makefile.unix.mk",
"diff": "@@ -140,6 +140,8 @@ ifeq ($(PLATFORM),LINUX)\n# This is needed to find libz.a\nZLIB_LNK = -lz\n# This is needed to find libprotobuf.a\n+ ifeq ($(DISTRIBUTION_ID),Fedora)\n+ PROTOBU... | C++ | Apache License 2.0 | google/or-tools | support Fedora lib64 protobuf install path |
261,230 | 23.10.2017 13:02:46 | -7,200 | 8076200a3a82f766bca01e93b9e62c119ca13623 | fix in makefiles | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.unix.mk",
"new_path": "makefiles/Makefile.unix.mk",
"diff": "@@ -142,7 +142,7 @@ ifeq ($(PLATFORM),LINUX)\n# This is needed to find libprotobuf.a\nifeq ($(DISTRIBUTION_ID),Fedora)\nPROTOBUF_LNK = $(UNIX_PROTOBUF_DIR)/lib64/libprotobuf.a\n- i... | C++ | Apache License 2.0 | google/or-tools | fix in makefiles |
261,230 | 25.10.2017 14:20:21 | -7,200 | c5d3788a3e319c5633c464f78f1c516bf9dbefce | solution observer in python/SAT | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/python/cp_model.py",
"new_path": "ortools/sat/python/cp_model.py",
"diff": "@@ -26,6 +26,7 @@ from six import iteritems\nfrom ortools.sat import cp_model_pb2\nfrom ortools.sat import pywrapsat\n+from ortools.sat import sat_parameters_pb2\n# The cla... | C++ | Apache License 2.0 | google/or-tools | solution observer in python/SAT |
261,230 | 25.10.2017 14:20:56 | -7,200 | 3cbcf986045a40605910e6210abb3d31772fa7f7 | work in progress, python version of the steel mill slab problem with the sat solver | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/python/steel_mill_slab_sat.py",
"diff": "+from __future__ import print_function\n+\n+import argparse\n+from ortools.sat.python import cp_model\n+import time\n+\n+parser = argparse.ArgumentParser()\n+\n+parser.add_argument('--problem', d... | C++ | Apache License 2.0 | google/or-tools | work in progress, python version of the steel mill slab problem with the sat solver |
261,230 | 25.10.2017 15:27:19 | -7,200 | 91783cb848fd3f41fab87d33a5a220def2aa6894 | filter slabs | [
{
"change_type": "MODIFY",
"old_path": "examples/python/steel_mill_slab_sat.py",
"new_path": "examples/python/steel_mill_slab_sat.py",
"diff": "@@ -416,7 +416,7 @@ class AllSolutionsCollector(cp_model.CpSolverSolutionCallback):\ndef NewSolution(self):\nsolution = [self.Value(v) for v in self.__varia... | C++ | Apache License 2.0 | google/or-tools | filter slabs |
261,230 | 25.10.2017 15:27:40 | -7,200 | 157d360ecf94c5eecc08a06af37235015585f2b1 | add manylinux1-image-no-cache docker targer | [
{
"change_type": "MODIFY",
"old_path": "tools/docker/Makefile",
"new_path": "tools/docker/Makefile",
"diff": "@@ -123,5 +123,8 @@ centos-7-test: export centos-7-image\nmanylinux1-image:\ndocker build -f manylinux1.Dockerfile -t or-tools-manylinux1-image .\n+manylinux1-image-no-cache:\n+ docker build... | C++ | Apache License 2.0 | google/or-tools | add manylinux1-image-no-cache docker targer |
261,230 | 26.10.2017 11:49:22 | -7,200 | 6cf95ec0e775efbaf22cef7629d4e9c8894fb257 | more work on steel_mill_slab_sat | [
{
"change_type": "MODIFY",
"old_path": "examples/python/steel_mill_slab_sat.py",
"new_path": "examples/python/steel_mill_slab_sat.py",
"diff": "@@ -458,7 +458,7 @@ def CollectValidSlabs(capacities, colors, widths, loss_array, all_colors):\nreturn collector.AllSolutions()\n-def SteelMillSlabWithColum... | C++ | Apache License 2.0 | google/or-tools | more work on steel_mill_slab_sat |
261,230 | 27.10.2017 11:21:31 | -7,200 | 1cd11a990fea213f2df6bd8a81c174721c53dfb4 | remove win patch for cbc | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.win.mk",
"new_path": "makefiles/Makefile.third_party.win.mk",
"diff": "@@ -307,7 +307,6 @@ dependencies\\sources\\cbc-$(CBC_TAG)\\Cbc\\MSVisualStudio\\v10\\$(CBC_PLATFORM)\\cbc.e\ndependencies\\sources\\cbc-$(CBC_TAG)\\configure:... | C++ | Apache License 2.0 | google/or-tools | remove win patch for cbc |
261,230 | 27.10.2017 17:06:01 | -7,200 | b938134fa1c13cdf7c3d77ec45939c309fcedeeb | cleanup steel_mill_slab_sat | [
{
"change_type": "MODIFY",
"old_path": "examples/python/steel_mill_slab_sat.py",
"new_path": "examples/python/steel_mill_slab_sat.py",
"diff": "@@ -11,9 +11,9 @@ parser.add_argument('--problem', default = 2, type = int,\nhelp = 'Problem id to solve.')\nparser.add_argument('--break_symmetries', defau... | C++ | Apache License 2.0 | google/or-tools | cleanup steel_mill_slab_sat |
261,243 | 29.10.2017 12:31:35 | 25,200 | 4bffd328d33c01590c78cc5cf26542aa19b4c7a1 | Instructions for standalone binary | [
{
"change_type": "MODIFY",
"old_path": "examples/fsharp/README.md",
"new_path": "examples/fsharp/README.md",
"diff": "@@ -16,3 +16,25 @@ fsharpc --target:exe --out:bin/<example_file>.exe --platform:anycpu --lib:bin -r\nDYLD_FALLBACK_LIBRARY_PATH=lib mono bin/<example_file>.exe\n```\n+\n+## Compiling... | C++ | Apache License 2.0 | google/or-tools | Instructions for standalone binary |
261,230 | 31.10.2017 09:58:07 | -3,600 | 5f9896f11b642b67bd641facffb00d6edb2fc084 | deliver make.exe on windows archive | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.archive.mk",
"new_path": "makefiles/Makefile.archive.mk",
"diff": "@@ -97,6 +97,7 @@ cc_archive: cc\n$(COPY) ortools$Sutil$S*.h temp$S$(INSTALL_DIR)$Sinclude$Sortools$Sutil\nifeq \"$(SYSTEM)\" \"win\"\n+ $(COPY) tools$Smake.exe temp$S$(INSTA... | C++ | Apache License 2.0 | google/or-tools | deliver make.exe on windows archive |
261,230 | 31.10.2017 10:06:53 | -3,600 | ccb29e483f9b8f67078e22346728132603ef8a45 | update python examples README, install: remove Makefile, remove check_python_deps, update README | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.python.mk",
"new_path": "makefiles/Makefile.python.mk",
"diff": "@@ -264,14 +264,10 @@ python_examples_archive:\n$(MKDIR) temp$Sortools_examples$Sexamples$Sdata\n$(COPY) examples$Spython$S*.py temp$Sortools_examples$Sexamples$Spython\n$(COPY... | C++ | Apache License 2.0 | google/or-tools | update python examples README, install: remove Makefile, remove check_python_deps, update README |
261,230 | 31.10.2017 10:11:44 | -3,600 | 743e212a0b6bfd8740feb05589557888e95a79b7 | remove setup.py from python_examples_archive | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.python.mk",
"new_path": "makefiles/Makefile.python.mk",
"diff": "@@ -265,10 +265,6 @@ python_examples_archive:\n$(COPY) examples$Spython$S*.py temp$Sortools_examples$Sexamples$Spython\n$(COPY) tools$SREADME.examples.python temp$Sortools_exam... | C++ | Apache License 2.0 | google/or-tools | remove setup.py from python_examples_archive |
261,230 | 03.11.2017 01:30:21 | -3,600 | 997608b9de1a88cb1b0470cc35905170076d0701 | add rcpsp namespace to rcpsp proto | [
{
"change_type": "MODIFY",
"old_path": "examples/cpp/rcpsp_sat.cc",
"new_path": "examples/cpp/rcpsp_sat.cc",
"diff": "@@ -33,11 +33,11 @@ DEFINE_string(params, \"\", \"Sat parameters in text proto format.\");\nnamespace operations_research {\nnamespace sat {\n-int ComputeNaiveHorizon(const util::Rcp... | C++ | Apache License 2.0 | google/or-tools | add rcpsp namespace to rcpsp proto |
261,230 | 03.11.2017 23:36:21 | -3,600 | 47102479212acaf304dd2f2cd97bc71214aa5c70 | skeleton files to support rcpsp loader from python | [
{
"change_type": "MODIFY",
"old_path": "examples/cpp/rcpsp_sat.cc",
"new_path": "examples/cpp/rcpsp_sat.cc",
"diff": "@@ -52,7 +52,7 @@ int64 VectorSum(const std::vector<int64>& v) {\n}\nvoid LoadAndSolve(const std::string& file_name) {\n- RcpspParser parser;\n+ util::rcpsp::RcpspParser parser;\nCHE... | C++ | Apache License 2.0 | google/or-tools | skeleton files to support rcpsp loader from python |
261,230 | 04.11.2017 23:26:01 | -3,600 | 42e0a0b91ffbd3e5a500e1cac70a3c9ec46123b8 | working version of rcpsp_sat in python | [
{
"change_type": "MODIFY",
"old_path": "examples/cpp/rcpsp_sat.cc",
"new_path": "examples/cpp/rcpsp_sat.cc",
"diff": "@@ -56,7 +56,7 @@ void LoadAndSolve(const std::string& file_name) {\nCHECK(parser.LoadFile(file_name));\nLOG(INFO) << \"Successfully read '\" << file_name << \"'.\";\nutil::rcpsp::Rc... | C++ | Apache License 2.0 | google/or-tools | working version of rcpsp_sat in python |
261,230 | 04.11.2017 23:50:06 | -3,600 | 432cfed06fb0d45f73c59a9362516b7c8796edcc | fix delayed solution value in sat solution observer | [
{
"change_type": "MODIFY",
"old_path": "examples/python/rcpsp_sat.py",
"new_path": "examples/python/rcpsp_sat.py",
"diff": "@@ -237,7 +237,6 @@ def SolveRcpsp(problem, proto_file):\nprint(' - wall time : %f s' % solver.WallTime())\n-\ndef main(args):\nparser = pywraputil.RcpspParser()\nparser.LoadFi... | C++ | Apache License 2.0 | google/or-tools | fix delayed solution value in sat solution observer |
261,230 | 04.11.2017 23:52:44 | -3,600 | a4716f97f52be1e3f672840fb30f5179897ed765 | simplify steel_mill_slab_sat after previous fix | [
{
"change_type": "MODIFY",
"old_path": "examples/python/steel_mill_slab_sat.py",
"new_path": "examples/python/steel_mill_slab_sat.py",
"diff": "@@ -269,23 +269,18 @@ class SteelMillSlabSolutionPrinter(cp_model.CpSolverSolutionCallback):\nprint(line)\n-class SteelMillSlabColumnSolutionPrinter(cp_mode... | C++ | Apache License 2.0 | google/or-tools | simplify steel_mill_slab_sat after previous fix |
261,230 | 05.11.2017 10:31:52 | -3,600 | bdd72fe1b1f48e69101c459b64e873e213221c12 | Add SearchForAllSolution in sat cp_model.py API; add code to export model from the steel_mill_slab_sat code | [
{
"change_type": "MODIFY",
"old_path": "examples/python/steel_mill_slab_sat.py",
"new_path": "examples/python/steel_mill_slab_sat.py",
"diff": "@@ -14,6 +14,9 @@ parser.add_argument('--break_symmetries', default = True, type = bool,\nparser.add_argument(\n'--solver', default = \"mip_column\",\nhelp ... | C++ | Apache License 2.0 | google/or-tools | Add SearchForAllSolution in sat cp_model.py API; add code to export model from the steel_mill_slab_sat code |
261,230 | 05.11.2017 10:39:02 | -3,600 | 91f3b1dac3f91e0c622578d05444fb0926309061 | add CpModel.HasObjective() | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/python/cp_model.py",
"new_path": "ortools/sat/python/cp_model.py",
"diff": "@@ -897,6 +897,9 @@ class CpModel(object):\n\"\"\"Sets the objective of the model to maximize(obj).\"\"\"\nself._SetObjective(obj, minimize=False)\n+ def HasObjective(self)... | C++ | Apache License 2.0 | google/or-tools | add CpModel.HasObjective() |
261,230 | 10.11.2017 18:31:37 | -3,600 | 6df48887ce9c5e0732a6caf4edfdd36b82111b19 | improve precision in glop | [
{
"change_type": "MODIFY",
"old_path": "ortools/glop/entering_variable.cc",
"new_path": "ortools/glop/entering_variable.cc",
"diff": "@@ -95,32 +95,6 @@ Status EnteringVariable::PrimalChooseEnteringColumn(ColIndex* entering_col) {\nreturn Status::OK();\n}\n-namespace {\n-\n-// Store a column with it... | C++ | Apache License 2.0 | google/or-tools | improve precision in glop |
261,230 | 13.11.2017 13:51:20 | -3,600 | df4d0cbadda2ea0f162e67f51a6f8df9cda33eb0 | fix comment in bop | [
{
"change_type": "MODIFY",
"old_path": "ortools/bop/bop_solution.h",
"new_path": "ortools/bop/bop_solution.h",
"diff": "namespace operations_research {\nnamespace bop {\n-// A Bop solution is a boolean assignment for each variable of the\n-// problem. The cost value associated to the solution is the... | C++ | Apache License 2.0 | google/or-tools | fix comment in bop |
261,230 | 13.11.2017 13:51:40 | -3,600 | 69159385dd309a1e42f98ff94931a0f851717568 | fix check in sat circuit constraint | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/circuit.cc",
"new_path": "ortools/sat/circuit.cc",
"diff": "@@ -235,11 +235,18 @@ bool CircuitPropagator::Propagate() {\nconst LiteralIndex literal_index = graph_[end_node][start_node];\nif (LiteralIndexIsFalse(literal_index)) continue;\n- // We wo... | C++ | Apache License 2.0 | google/or-tools | fix check in sat circuit constraint |
261,230 | 13.11.2017 13:52:07 | -3,600 | e5b72c836ea17287367c66252d26de94086394c1 | optimized expanded model for reservoirs with single sign demands | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/cp_model_expand.cc",
"new_path": "ortools/sat/cp_model_expand.cc",
"diff": "@@ -148,6 +148,21 @@ void ExpandReservoir(ConstraintProto* ct, RewriteContext* context) {\nconst int num_variables = reservoir.times_size();\nCpModelProto& expanded = conte... | C++ | Apache License 2.0 | google/or-tools | optimized expanded model for reservoirs with single sign demands |
261,230 | 13.11.2017 15:45:02 | -3,600 | ae3007234b14eedf8368af7009e56f034d41b55f | fix sat python reservoir code; continue working on rcpsp_sat.py to support consumer/producer problems | [
{
"change_type": "MODIFY",
"old_path": "examples/python/rcpsp_sat.py",
"new_path": "examples/python/rcpsp_sat.py",
"diff": "@@ -34,9 +34,13 @@ def SolveRcpsp(problem, proto_file):\n# Determine problem type.\nproblem_type = ('Resource investment' if problem.is_resource_investment\nelse 'RCPSP')\n- if... | C++ | Apache License 2.0 | google/or-tools | fix sat python reservoir code; continue working on rcpsp_sat.py to support consumer/producer problems |
261,230 | 14.11.2017 13:51:03 | -3,600 | 4caed0fbdd90fd25cf9c3b739f61b3e45b379793 | hide classes from cp_model.py from the pydoc tool. | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/python/cp_model.py",
"new_path": "ortools/sat/python/cp_model.py",
"diff": "@@ -44,19 +44,19 @@ MODEL_UNSAT = cp_model_pb2.MODEL_UNSAT\nOPTIMAL = cp_model_pb2.OPTIMAL\n-def AssertIsInt64(x):\n+def _AssertIsInt64(x):\nif not isinstance(x, numbers.In... | C++ | Apache License 2.0 | google/or-tools | hide classes from cp_model.py from the pydoc tool. |
261,230 | 14.11.2017 14:28:23 | -3,600 | b091adaf3f34f59cf848b61bcf54cda1487ceac7 | improve make clean* | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.cpp.mk",
"new_path": "makefiles/Makefile.cpp.mk",
"diff": "@@ -32,15 +32,17 @@ clean_cc:\n-$(DEL) $(BIN_DIR)$Ssat_runner$E\n-$(DEL) $(CP_BINARIES)\n-$(DEL) $(LP_BINARIES)\n- -$(DEL) $(GEN_DIR)$Sconstraint_solver$S*.pb.*\n- -$(DEL) $(GEN_DIR)... | C++ | Apache License 2.0 | google/or-tools | improve make clean* |
261,230 | 14.11.2017 14:28:46 | -3,600 | 9e14920ad86150fd1fa4a8d8435f5cc820c9be7b | improve sat and sat/reservoir | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/all_different.cc",
"new_path": "ortools/sat/all_different.cc",
"diff": "@@ -399,9 +399,7 @@ bool AllDifferentConstraint::Propagate() {\nMakeAugmentingPath(old_variable);\nDCHECK_EQ(variable_to_value_[old_variable], -1); // No reassignment.\n- // TO... | C++ | Apache License 2.0 | google/or-tools | improve sat and sat/reservoir |
261,230 | 14.11.2017 16:43:16 | -3,600 | 399c1b5ab6461b68d0b92480304e8ab781fa7d0a | fix pypi setup | [
{
"change_type": "MODIFY",
"old_path": "tools/setup.py",
"new_path": "tools/setup.py",
"diff": "@@ -32,10 +32,10 @@ setup(\n'ortools',\n'ortools.algorithms',\n'ortools.constraint_solver',\n+ 'ortools.data',\n'ortools.graph',\n'ortools.linear_solver',\n- 'ortools.sat',\n- 'ortools.util',],\n+ 'ortool... | C++ | Apache License 2.0 | google/or-tools | fix pypi setup |
261,230 | 14.11.2017 16:58:07 | -3,600 | 14564c091732c4aafc90882982c3af7932f277ab | simplify reservoir expand; change a bit the enqueue protocol in the sat solver | [
{
"change_type": "MODIFY",
"old_path": "examples/python/rcpsp_sat.py",
"new_path": "examples/python/rcpsp_sat.py",
"diff": "@@ -225,9 +225,10 @@ def SolveRcpsp(problem, proto_file):\nintervals_per_resource[r], demands_per_resource[r], c)\nelif presences_per_resource[r]: # Non empty non renewable res... | C++ | Apache License 2.0 | google/or-tools | simplify reservoir expand; change a bit the enqueue protocol in the sat solver |
261,230 | 14.11.2017 22:13:51 | -3,600 | 456bb22ae697d984b68b5c3583c8507aac29f676 | bump protobuf to 3.5.0 | [
{
"change_type": "MODIFY",
"old_path": "Dependencies.txt",
"new_path": "Dependencies.txt",
"diff": "-Protobuf = 3.4.1\n+Protobuf = 3.5.0\ngflags = 2.2.1\nglog = 0.3.5\nCbc = 2.9.9\n"
},
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "make... | C++ | Apache License 2.0 | google/or-tools | bump protobuf to 3.5.0 |
261,230 | 15.11.2017 13:23:57 | -3,600 | cb6cd7d4c14386fffceff57ba801d30d84067c57 | cleanup of the sat reservoir constraint code | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/cp_model_checker.cc",
"new_path": "ortools/sat/cp_model_checker.cc",
"diff": "@@ -155,6 +155,27 @@ std::string ValidateLinearConstraint(const CpModelProto& model,\nreturn \"\";\n}\n+std::string ValidateReservoirConstraint(const CpModelProto& model,... | C++ | Apache License 2.0 | google/or-tools | cleanup of the sat reservoir constraint code |
261,230 | 16.11.2017 13:31:53 | -3,600 | f4af14a3162db63e52d9e5fe29bbe5d0b9742844 | more propagation in the sat solver when a node has a set of dependencies where one of them must be chosed | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/cp_constraints.cc",
"new_path": "ortools/sat/cp_constraints.cc",
"diff": "@@ -430,26 +430,28 @@ bool NonOverlappingRectanglesPropagator<S>::PushOneBox(int box, int other) {\ntemplate class NonOverlappingRectanglesPropagator<IntegerVariable>;\ntempl... | C++ | Apache License 2.0 | google/or-tools | more propagation in the sat solver when a node has a set of dependencies where one of them must be chosed |
261,230 | 16.11.2017 17:48:30 | -3,600 | a4a06a357a3aca8024a556c5c95610b09b73b286 | improve rcpsp parser and rcpsp_sat.py | [
{
"change_type": "MODIFY",
"old_path": "examples/python/rcpsp_sat.py",
"new_path": "examples/python/rcpsp_sat.py",
"diff": "@@ -57,6 +57,12 @@ def SolveRcpsp(problem, proto_file):\nhorizon = problem.deadline if problem.deadline != -1 else problem.horizon\nif horizon == -1: # Naive computation.\nhori... | C++ | Apache License 2.0 | google/or-tools | improve rcpsp parser and rcpsp_sat.py |
261,230 | 16.11.2017 23:27:58 | -3,600 | 6c484ad4f854ca0acc5abbc608da0be85f4621c6 | fix sat python support in or-tools | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.python.mk",
"new_path": "makefiles/Makefile.python.mk",
"diff": "@@ -76,9 +76,9 @@ clean_python:\n-$(DEL) $(OBJ_DIR)$Sswig$S*python_wrap.$O\n-$(DELREC) $(PYPI_ARCHIVE_TEMP_DIR)\n-install_python_modules: dependencies/sources/protobuf-3.3.0/py... | C++ | Apache License 2.0 | google/or-tools | fix sat python support in or-tools |
261,230 | 17.11.2017 00:19:34 | -3,600 | f3a9a1f2d64f262c2f6b0c8222ece2429dac2631 | fix python3 support in and out of protobufs | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.python.mk",
"new_path": "makefiles/Makefile.python.mk",
"diff": "@@ -17,6 +17,7 @@ endif\nifeq ($(shell $(PYTHON_EXECUTABLE) -c \"from sys import version_info as v; print (str(v[0]))\"),3)\nPYTHON3 = true\nSWIG_PYTHON3_FLAG=-py3 -DPY3\n+ PYT... | C++ | Apache License 2.0 | google/or-tools | fix python3 support in and out of protobufs |
261,230 | 20.11.2017 11:35:29 | -3,600 | 86cd5bd83f3b4bcda4b13571dbd1b2398453c7e5 | fix a bug with optional integer variables in sat; change reason protocol | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/circuit.cc",
"new_path": "ortools/sat/circuit.cc",
"diff": "namespace operations_research {\nnamespace sat {\n-CircuitPropagator::CircuitPropagator(\n- std::vector<std::vector<LiteralIndex>> graph, Options options, Trail* trail)\n+CircuitPropagator... | C++ | Apache License 2.0 | google/or-tools | fix a bug with optional integer variables in sat; change reason protocol |
261,230 | 20.11.2017 17:06:16 | -3,600 | 4abd300cdde07e4fff1aee1a94e504899ae1894b | revert python example | [
{
"change_type": "MODIFY",
"old_path": "examples/python/jobshop_ft06_sat.py",
"new_path": "examples/python/jobshop_ft06_sat.py",
"diff": "-{\n- \"cells\": [\n- {\n- \"cell_type\": \"code\",\n- \"execution_count\": null,\n- \"metadata\": {\n- \"collapsed\": false\n- },\n- \"outputs\": [],\n- \"source... | C++ | Apache License 2.0 | google/or-tools | revert python example |
261,230 | 20.11.2017 17:12:12 | -3,600 | 4a58e5ce38ae027135e4721b536748fc3603f0c3 | colab -> notebook | [
{
"change_type": "RENAME",
"old_path": "examples/colab/gate_scheduling_sat.ipynb",
"new_path": "examples/notebook/gate_scheduling_sat.ipynb",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "examples/colab/hidato_sat.ipynb",
"new_path": "examples/notebook/hidato_sat.ipynb",
... | C++ | Apache License 2.0 | google/or-tools | colab -> notebook |
261,230 | 20.11.2017 17:53:07 | -3,600 | c8bd25f27d8fe134c5fcd881afda26b090d2fd0e | fix jobshop notebook | [
{
"change_type": "MODIFY",
"old_path": "examples/notebook/jobshop_ft06_sat.ipynb",
"new_path": "examples/notebook/jobshop_ft06_sat.ipynb",
"diff": "},\n\"outputs\": [],\n\"source\": [\n- \"{\\n\",\n- \" \\\"cells\\\": [\\n\",\n- \" {\\n\",\n- \" \\\"cell_type\\\": \\\"code\\\",\\n\",\n- \" \\\"execu... | C++ | Apache License 2.0 | google/or-tools | fix jobshop notebook |
261,230 | 21.11.2017 11:43:36 | 0 | 17f73d5335947d3b891a44b82b6dc7221f8c6121 | fix make missing_directories on windows | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.win.mk",
"new_path": "makefiles/Makefile.third_party.win.mk",
"diff": "@@ -25,6 +25,7 @@ MISSING_DIRECTORIES = \\\nobjs/com/google/ortools \\\nobjs/constraint_solver \\\nobjs/flatzinc \\\n+ objs/data \\\nobjs/glop \\\nobjs/graph ... | C++ | Apache License 2.0 | google/or-tools | fix make missing_directories on windows |
261,230 | 21.11.2017 14:15:26 | -3,600 | 7ee023e15d57ab0530eb3b7abe3f17c664f0e001 | new trivial sat python example | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/python/worker_schedule_sat.py",
"diff": "+from ortools.sat.python import cp_model\n+\n+\n+def schedule():\n+\n+ # Input data.\n+ positions = [\n+ 1, 2, 8, 10, 5, 3, 4, 3, 6, 6, 4, 5, 4, 3, 4, 4, 3, 4, 2, 1, 0, 0, 0, 0,\n+ 1, 2, 9, 9, 4,... | C++ | Apache License 2.0 | google/or-tools | new trivial sat python example |
261,230 | 21.11.2017 16:01:04 | -3,600 | 75109df0f23653d38759f96adccb49e3c0473ab9 | split out cp sat objective code in its own file | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.gen.mk",
"new_path": "makefiles/Makefile.gen.mk",
"diff": "@@ -1566,6 +1566,7 @@ SAT_LIB_OBJS = \\\n$(OBJ_DIR)/sat/cp_constraints.$O \\\n$(OBJ_DIR)/sat/cp_model_checker.$O \\\n$(OBJ_DIR)/sat/cp_model_expand.$O \\\n+ $(OBJ_DIR)/sat/cp_model_o... | C++ | Apache License 2.0 | google/or-tools | split out cp sat objective code in its own file |
261,230 | 22.11.2017 11:25:51 | -3,600 | b404a0b98908e9235e55a72cb15fb19fe9b3ab34 | scrub python sat examples from colab features | [
{
"change_type": "MODIFY",
"old_path": "examples/python/gate_scheduling_sat.py",
"new_path": "examples/python/gate_scheduling_sat.py",
"diff": "@@ -23,7 +23,6 @@ The objective is to minimize the max end time of all jobs.\n\"\"\"\nfrom ortools.sat.python import cp_model\n-from ortools.sat.python impo... | C++ | Apache License 2.0 | google/or-tools | scrub python sat examples from colab features |
261,230 | 22.11.2017 14:55:44 | -3,600 | b645ce1f52cc6384400d9abfd24fdcf67d903a7a | add license to examples; add example from the documentation | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/python/assignment_sat.py",
"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 | add license to examples; add example from the documentation |
261,230 | 22.11.2017 15:18:01 | -3,600 | 1f34325cb13f0850efa2157fe341242f513f9fdb | fix indent and dos line format | [
{
"change_type": "MODIFY",
"old_path": "examples/python/jobshop_ft06_sat.py",
"new_path": "examples/python/jobshop_ft06_sat.py",
"diff": "@@ -52,7 +52,9 @@ def main():\nend_var = model.NewIntVar(0, horizon, 'end_%i_%i' % (i, j))\ninterval_var = model.NewIntervalVar(start_var, duration, end_var,\n'in... | C++ | Apache License 2.0 | google/or-tools | fix indent and dos line format |
261,230 | 22.11.2017 15:56:22 | -3,600 | 3aca895d9651595038f053f30e2d57d3502f3f5a | add more examples from the doc | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/python/cp_is_fun_sat.py",
"diff": "+# Copyright 2010-2011 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 the... | C++ | Apache License 2.0 | google/or-tools | add more examples from the doc |
261,230 | 22.11.2017 16:17:28 | -3,600 | 6b9bf72c03b08eff944a1079e172158f804ccc2c | improve logging of cp_is_fun_sat.py | [
{
"change_type": "MODIFY",
"old_path": "examples/python/cp_is_fun_sat.py",
"new_path": "examples/python/cp_is_fun_sat.py",
"diff": "@@ -21,7 +21,6 @@ This problem has 72 different solutions in base 10.\n\"\"\"\nfrom __future__ import print_function\n-import time\nfrom ortools.sat.python import cp_mo... | C++ | Apache License 2.0 | google/or-tools | improve logging of cp_is_fun_sat.py |
261,230 | 22.11.2017 16:55:47 | -3,600 | 26e9fc9e52d915901556d44d7edc6e2f87c9fff9 | 2 more examples CP and SAT/CP | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/python/assignment_with_constraints.py",
"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... | C++ | Apache License 2.0 | google/or-tools | 2 more examples CP and SAT/CP |
261,230 | 22.11.2017 16:59:12 | -3,600 | 2126949bb500a9f42f885202e7e343cc04397091 | improve SAT/CP example | [
{
"change_type": "MODIFY",
"old_path": "examples/python/assignment_with_constraints_sat.py",
"new_path": "examples/python/assignment_with_constraints_sat.py",
"diff": "@@ -70,7 +70,8 @@ def main():\nmodel.AddMaxEquality(works[i], x[i])\n# Each task is assigned to at least one worker.\n- [model.Add(s... | C++ | Apache License 2.0 | google/or-tools | improve SAT/CP example |
261,218 | 22.11.2017 17:48:44 | -3,600 | e4ef0d1eb50c0b57c6b3cb02219b71d35ee2222f | update .gitignore
add *.swp (vim)
temp-python (make pypi_archive_dir)
jupyter notebook cache | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -18,14 +18,17 @@ or-tools*.zip\n*.exp\n*.pdb\n*.ass\n+*.swp\nbin/\nortools/gen/\nobjs/\ntemp/\n+temp-python*\nlib/\nexamples/csharp/solution/*.csproj\nexamples/csharp/*.sln\n+examples/notebook/.ipynb_checkpoin... | C++ | Apache License 2.0 | google/or-tools | update .gitignore
add *.swp (vim)
temp-python (make pypi_archive_dir)
jupyter notebook cache |
261,218 | 22.11.2017 17:46:06 | -3,600 | 31cadc3f7d20b9ff5ecc1fb1be58c5de8d9515ae | Add README.md to examples/notebook | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/notebook/README.md",
"diff": "+# Introduction\n+First and foremost, the Jupyter Notebook is an interactive environment for writing and running code.\n+\n+# Perequisite: Python3\n+These notebooks are associated with the IPython3 kernel, ... | C++ | Apache License 2.0 | google/or-tools | Add README.md to examples/notebook |
261,230 | 23.11.2017 11:26:11 | -3,600 | 238c35799405d022ce8cacfd9ae9e56ec8a89b2c | new python nurses examples in cp/sat and cp | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/python/nurses_cp.py",
"diff": "+\n+from __future__ import print_function\n+import sys\n+from ortools.constraint_solver import pywrapcp\n+\n+def main():\n+ # Creates the solver.\n+ solver = pywrapcp.Solver(\"schedule_shifts\")\n+\n+ num_... | C++ | Apache License 2.0 | google/or-tools | new python nurses examples in cp/sat and cp |
261,230 | 23.11.2017 11:28:47 | -3,600 | f84fe1b883797e12fa9cdfca84cbfa6a956f4cbc | cp_model.AddSumConstraint(variables, lb, ub) | [
{
"change_type": "MODIFY",
"old_path": "examples/python/nurses_sat.py",
"new_path": "examples/python/nurses_sat.py",
"diff": "@@ -80,7 +80,7 @@ def main():\n# Each nurse works 5 or 6 days in a week.\n# That is each nurse works shift 0 at most 2 times.\nfor n in all_nurses:\n- model.Add(sum(shifts[(n... | C++ | Apache License 2.0 | google/or-tools | cp_model.AddSumConstraint(variables, lb, ub) |
261,230 | 23.11.2017 13:19:22 | -3,600 | b49dc2a2ad8392d60a23b3e2e8187219e3215db3 | fix bug in sat with non-monotonic propagators (aka LP) | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/precedences.cc",
"new_path": "ortools/sat/precedences.cc",
"diff": "@@ -757,6 +757,7 @@ void PrecedencesPropagator::AddGreaterThanAtLeastOneOfConstraints(\nselectors.push_back(Literal(arcs_[a].presence_l));\n}\nmodel->Add(GreaterThanAtLeastOneOf(ta... | C++ | Apache License 2.0 | google/or-tools | fix bug in sat with non-monotonic propagators (aka LP) |
261,230 | 23.11.2017 15:25:53 | -3,600 | 89edd70833c514cd167f407ca3f01e537cc3e59f | add examples that captures code samples in the documentation | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/python/code_samples_sat.py",
"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 | add examples that captures code samples in the documentation |
261,218 | 23.11.2017 16:29:13 | -3,600 | 7b13e40fc4b735db144690aaf70a6fed69e1f11b | add ipython notebooks | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/notebook/code_samples_sat.ipynb",
"diff": "+{\n+ \"cells\": [\n+ {\n+ \"cell_type\": \"code\",\n+ \"execution_count\": null,\n+ \"metadata\": {\n+ \"collapsed\": false\n+ },\n+ \"outputs\": [],\n+ \"source\": [\n+ \"# Copyright 2010-201... | C++ | Apache License 2.0 | google/or-tools | add ipython notebooks |
261,230 | 23.11.2017 19:16:17 | -3,600 | 7f43c6e20619f5ee28987d82cf57a4265febb41d | use parameters in sat cp solve | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/python/cp_model.py",
"new_path": "ortools/sat/python/cp_model.py",
"diff": "@@ -1010,7 +1010,8 @@ class CpSolver(object):\ndef Solve(self, model):\n\"\"\"Solves the given model and returns the solve status.\"\"\"\n- self.__solution = pywrapsat.SatH... | C++ | Apache License 2.0 | google/or-tools | use parameters in sat cp solve |
261,230 | 24.11.2017 10:44:54 | -3,600 | 7cc392b785c08ac16d458f127e67378eeed5c6d0 | speed up sat disjunctive constraint | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/disjunctive.cc",
"new_path": "ortools/sat/disjunctive.cc",
"diff": "@@ -131,8 +131,8 @@ std::function<void(Model*)> DisjunctiveWithBooleanPrecedences(\n}\nvoid TaskSet::AddEntry(const Entry& e) {\n+ int j = sorted_tasks_.size();\nsorted_tasks_.push... | C++ | Apache License 2.0 | google/or-tools | speed up sat disjunctive constraint |
261,230 | 24.11.2017 10:45:16 | -3,600 | 0ead5718d66b8b0c0092da37f8e365e3edfef5a6 | add notebooks to python archives | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.python.mk",
"new_path": "makefiles/Makefile.python.mk",
"diff": "@@ -309,8 +309,11 @@ python_examples_archive:\n$(MKDIR) temp$Sortools_examples\n$(MKDIR) temp$Sortools_examples$Sexamples\n$(MKDIR) temp$Sortools_examples$Sexamples$Spython\n+ ... | C++ | Apache License 2.0 | google/or-tools | add notebooks to python archives |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.