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,218 | 19.04.2018 16:27:51 | -7,200 | 9e07fd6985385a48405cfa9de754b1eb954afb5f | Fix CMake proto_path | [
{
"change_type": "MODIFY",
"old_path": "cmake/cpp.cmake",
"new_path": "cmake/cpp.cmake",
"diff": "@@ -100,6 +100,15 @@ add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})\nset(PROTO_HDRS)\nset(PROTO_SRCS)\nfile(GLOB_RECURSE proto_files RELATIVE ${PROJECT_SOURCE_DIR} \"ortools/*.proto... | C++ | Apache License 2.0 | google/or-tools | Fix CMake proto_path |
261,301 | 20.04.2018 07:10:22 | -25,200 | 2b17893d7b36a2ccacc5526610c27422197a719f | Fix wrong marshall copy size for CppProtoType in C# wrapper | [
{
"change_type": "MODIFY",
"old_path": "ortools/util/csharp/proto.i",
"new_path": "ortools/util/csharp/proto.i",
"diff": "byte[] tmp = new byte[4];\nSystem.IntPtr data = $imcall;\nSystem.Runtime.InteropServices.Marshal.Copy(data, tmp, 0, 4);\n- int size = Convert.ToInt32(tmp[0]) +\n- Convert.ToInt32... | C++ | Apache License 2.0 | google/or-tools | Fix wrong marshall copy size for CppProtoType in C# wrapper |
261,218 | 20.04.2018 10:08:10 | -7,200 | 7cd01fd15ca7a62ac345883bcd215c3a9e18453c | Makefile: Fix protobuf path in protoc cmd
Windows use /Ipath but protoc only work with -Ipath (Unix style) | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.gen.mk",
"new_path": "makefiles/Makefile.gen.mk",
"diff": "@@ -597,7 +597,7 @@ $(OBJ_DIR)/util/xml_helper.$O: \\\n$(GEN_DIR)/ortools/util/optional_boolean.pb.cc: \\\n$(SRC_DIR)/ortools/util/optional_boolean.proto\n- $(PROTOBUF_DIR)/bin/proto... | C++ | Apache License 2.0 | google/or-tools | Makefile: Fix protobuf path in protoc cmd
- Windows use /Ipath but protoc only work with -Ipath (Unix style) |
261,218 | 20.04.2018 14:02:27 | -7,200 | a2a779ec604af5af5fb3afa0bfa6b9181b5b6512 | Windows: export missing protobuf .proto to deps/install/include | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.win.mk",
"new_path": "makefiles/Makefile.third_party.win.mk",
"diff": "@@ -144,6 +144,8 @@ dependencies\\install\\include\\google\\protobuf\\message.h: dependencies\\sources\\pro\ndependencies\\sources\\protobuf-$(PROTOBUF_TAG)\\... | C++ | Apache License 2.0 | google/or-tools | Windows: export missing protobuf .proto to deps/install/include |
261,218 | 20.04.2018 14:09:56 | -7,200 | 165240dd57f842dd131d585fd2f373f1637bc05c | Makefile use macro | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.win.mk",
"new_path": "makefiles/Makefile.third_party.win.mk",
"diff": "@@ -149,8 +149,8 @@ dependencies\\sources\\protobuf-$(PROTOBUF_TAG)\\cmake\\build\\include.tar: dependenc\ncd dependencies\\sources\\protobuf-$(PROTOBUF_TAG)\... | C++ | Apache License 2.0 | google/or-tools | Makefile use macro |
261,243 | 15.04.2018 00:45:14 | 25,200 | bf11c0086fc6933a82b4aed4352db147060df693 | Use project structure and dotnet cli | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -77,3 +77,7 @@ cache/\ntools/netstandard/CreateSigningKey/bin\ntools/netstandard/CreateSigningKey/obj\n+\n+ortools/fsharp/**/bin\n+ortools/fsharp/**/obj\n+ortools/fsharp/**/packages\n\\ No newline at end of fi... | C++ | Apache License 2.0 | google/or-tools | Use project structure and dotnet cli |
261,243 | 15.04.2018 09:20:08 | 25,200 | aa6b091bd7dd2e59acbab1e23965cd469ae6e6ed | Add xunit test library | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "ortools/fsharp/src/OrTools.FSharp.Test/Tests.fs",
"diff": "+namespace Google.OrTools.FSharp\n+\n+module Tests =\n+\n+ open System\n+ open Xunit\n+\n+ open Google.OrTools.LinearSolver\n+ // open Google.OrTools.FSharp\n+\n+ [<Fact>]\n+ let ``Linea... | C++ | Apache License 2.0 | google/or-tools | Add xunit test library |
261,243 | 18.04.2018 23:20:40 | 25,200 | 2aa0cc1e633be67823bdf5238f3666ba8e15e118 | Add dotnet-sdk support for linux/osx build | [
{
"change_type": "MODIFY",
"old_path": ".travis/install.sh",
"new_path": ".travis/install.sh",
"diff": "@@ -24,6 +24,17 @@ function installmono() {\nsudo apt-get install -yqq mono-complete\n}\n+function installdotnetsdk(){\n+ # Installs for Ubuntu Trusty distro\n+ curl https://packages.microsoft.com... | C++ | Apache License 2.0 | google/or-tools | Add dotnet-sdk support for linux/osx build |
261,243 | 19.04.2018 15:38:17 | 25,200 | 6b85eac1e58b1b4f2fe68b1120d181423635ca72 | fsproj to only use .fs files. Fix MacOS X build. | [
{
"change_type": "MODIFY",
"old_path": ".travis/install.sh",
"new_path": ".travis/install.sh",
"diff": "@@ -74,7 +74,11 @@ if [ \"${BUILDER}\" == make ]; then\nbrew cask install java;\nelif [ \"${LANGUAGE}\" == csharp ] || [ \"${LANGUAGE}\" == fsharp ]; then\nbrew install mono;\n- brew cask install ... | C++ | Apache License 2.0 | google/or-tools | fsproj to only use .fs files. Fix MacOS X build. |
261,243 | 19.04.2018 16:13:09 | 25,200 | c026a88e05c12e143dd68389092c9337d9fb0918 | Explicitly add location of dotnet executable | [
{
"change_type": "MODIFY",
"old_path": ".travis/install.sh",
"new_path": ".travis/install.sh",
"diff": "@@ -75,10 +75,9 @@ if [ \"${BUILDER}\" == make ]; then\nelif [ \"${LANGUAGE}\" == csharp ] || [ \"${LANGUAGE}\" == fsharp ]; then\nbrew install mono;\n# Installer changes path but won't be picked ... | C++ | Apache License 2.0 | google/or-tools | Explicitly add location of dotnet executable |
261,246 | 21.04.2018 04:29:10 | 14,400 | 4792fb9995076ae6158aaf134d97e3c0d84bde55 | Fix string issues for multithreading | [
{
"change_type": "MODIFY",
"old_path": "ortools/linear_solver/cbc_interface.cc",
"new_path": "ortools/linear_solver/cbc_interface.cc",
"diff": "@@ -370,7 +370,10 @@ MPSolver::ResultStatus CBCInterface::Solve(const MPSolverParameters& param) {\n// through callCbc.\nmodel.setAllowableFractionGap(relat... | C++ | Apache License 2.0 | google/or-tools | Fix string issues for multithreading |
261,247 | 23.04.2018 23:56:28 | 18,000 | b576adaa24cbd4eff3d138f0626c3e05fda6f4a3 | Update model_exporter.cc
writing "free" in front of unbounded variables. | [
{
"change_type": "MODIFY",
"old_path": "ortools/linear_solver/model_exporter.cc",
"new_path": "ortools/linear_solver/model_exporter.cc",
"diff": "@@ -349,14 +349,19 @@ bool MPModelProtoExporter::ExportModelAsLpFormat(bool obfuscated,\nif (var_proto.is_integer() && lb == round(lb) && ub == round(ub))... | C++ | Apache License 2.0 | google/or-tools | Update model_exporter.cc
writing "free" in front of unbounded variables. |
261,218 | 23.04.2018 09:42:09 | -7,200 | 3801e25481b58c71a71021ec5dbc9d43fdfba402 | Update UNIX_SWIG_BINARY managment | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.unix.mk",
"new_path": "makefiles/Makefile.unix.mk",
"diff": "@@ -12,11 +12,9 @@ UNIX_CLP_DIR ?= $(UNIX_CBC_DIR)\n# Unix specific definitions\nPROTOBUF_DIR = $(UNIX_PROTOBUF_DIR)\n-ifdef UNIX_SWIG_BINARY\n+UNIX_SWIG_BINARY ?= swig\nSWIG_BINAR... | C++ | Apache License 2.0 | google/or-tools | Update UNIX_SWIG_BINARY managment |
261,218 | 23.04.2018 09:43:45 | -7,200 | a556b34599d100b6d0f340399d5248f589dbbffe | Sort dependencies
glog depends on gflags
protobuf depends on glog | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.unix.mk",
"new_path": "makefiles/Makefile.unix.mk",
"diff": "@@ -138,16 +138,16 @@ ifeq ($(PLATFORM),LINUX)\nDYNAMIC_LD = g++ -shared\nMONO = LD_LIBRARY_PATH=$(LIB_DIR):$(LD_LIBRARY_PATH) $(MONO_EXECUTABLE)\n- # This is needed to find libgfl... | C++ | Apache License 2.0 | google/or-tools | Sort dependencies
glog depends on gflags
protobuf depends on glog |
261,218 | 23.04.2018 09:48:52 | -7,200 | 124526b78adcbe3a67eb89d2e2c3109a3cf975da | Update CBC/CLP lib management | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.unix.mk",
"new_path": "makefiles/Makefile.unix.mk",
"diff": "@@ -121,18 +121,6 @@ SWIG_INC = $(CLP_SWIG) $(CBC_SWIG) $(COIN_SWIG) \\\nDEBUG = -O4 -DNDEBUG\nJNIDEBUG = -O1 -DNDEBUG\n-# Check wether CBC/CLP need a coin subdir in library.\n-ifd... | C++ | Apache License 2.0 | google/or-tools | Update CBC/CLP lib management |
261,218 | 23.04.2018 17:05:19 | -7,200 | 8ab16151394af035416ba05a2e0c6b4b690dbf23 | Makefile: sort unix tools | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.unix.mk",
"new_path": "makefiles/Makefile.unix.mk",
"diff": "@@ -14,14 +14,8 @@ UNIX_CLP_DIR ?= $(UNIX_CBC_DIR)\nPROTOBUF_DIR = $(UNIX_PROTOBUF_DIR)\nUNIX_SWIG_BINARY ?= swig\nSWIG_BINARY = $(UNIX_SWIG_BINARY)\n-\n-MKDIR = mkdir\n-MKDIR_P = ... | C++ | Apache License 2.0 | google/or-tools | Makefile: sort unix tools |
261,218 | 23.04.2018 16:59:08 | -7,200 | edde01f4204da911f88a5b834874e761471dbac7 | Makefile.unix: move UNIX_*_DIR | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "makefiles/Makefile.third_party.unix.mk",
"diff": "@@ -4,6 +4,18 @@ help_third_party:\n@grep \"^.PHONY: .* #\" $(CURDIR)/makefiles/Makefile.third_party.unix.mk | sed \"s/\\.PHONY: \\(.*\\) # \\(.*\\)/\\1\\t\... | C++ | Apache License 2.0 | google/or-tools | Makefile.unix: move UNIX_*_DIR |
261,218 | 25.04.2018 16:51:26 | -7,200 | 76608645ddd1135934bdf631093d9596e2cb252b | Makefile.win: Sort windows definitions | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.win.mk",
"new_path": "makefiles/Makefile.win.mk",
"diff": "+# ----- You should not need to modify the following, unless the -----\n+# ----- configuration is not standard. In that case, please tell us -----\n+# ----- about it. -----\n+\n# Win... | C++ | Apache License 2.0 | google/or-tools | Makefile.win: Sort windows definitions |
261,218 | 23.04.2018 09:49:52 | -7,200 | 723ba573508846c78da3e4da15d9858d3f18138e | Makefile.Unix: Move some defs like in windows Makefile
Factorize CFLAGS/JNIFLAGS
Improve Linux/MacOS consistency | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "makefiles/Makefile.third_party.unix.mk",
"diff": "@@ -28,10 +28,6 @@ ifeq ($(PLATFORM), LINUX)\nPATCHELF=dependencies/install/bin/patchelf\nendif\n-ifeq ($(PLATFORM), MACOSX)\n- SET_COMPILER = CXX=\"$(CCC)\... | C++ | Apache License 2.0 | google/or-tools | Makefile.Unix: Move some defs like in windows Makefile
- Factorize CFLAGS/JNIFLAGS
- Improve Linux/MacOS consistency |
261,218 | 23.04.2018 17:06:59 | -7,200 | 18060f88bdb8300fef4bc4d8eb54ed3811664c93 | Makefile: move PATCHELF | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "makefiles/Makefile.third_party.unix.mk",
"diff": "@@ -23,11 +23,6 @@ GLOG_TAG = 0.3.5\nCBC_TAG = 2.9.9\nPATCHELF_TAG = 0.9\n-# Detect if patchelf is needed\n-ifeq ($(PLATFORM), LINUX)\n- PATCHELF=dependenci... | C++ | Apache License 2.0 | google/or-tools | Makefile: move PATCHELF |
261,218 | 24.04.2018 10:54:14 | -7,200 | 61507da9957f3ae28bc1b55e6075b891d208b6c9 | Add dynamic lib to OR_TOOLS_LNK | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.cpp.mk",
"new_path": "makefiles/Makefile.cpp.mk",
"diff": "@@ -209,7 +209,7 @@ clean_compat:\ninclude $(OR_ROOT)makefiles/Makefile.gen.mk\nOR_TOOLS_LIBS = $(LIB_DIR)/$(LIB_PREFIX)ortools.$(LIB_SUFFIX)\n-OR_TOOLS_LNK = $(PRE_LIB)ortools$(POST... | C++ | Apache License 2.0 | google/or-tools | Add dynamic lib to OR_TOOLS_LNK |
261,218 | 23.04.2018 17:14:54 | -7,200 | bbfa51873f6b9c208d4e6116334c5037e57423a7 | Makefile: Update Gflags | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "makefiles/Makefile.third_party.unix.mk",
"diff": "@@ -76,7 +76,10 @@ dependencies/install/include: dependencies/install\ndependencies/install/include/coin: dependencies/install/include\n$(MKDIR_P) dependenc... | C++ | Apache License 2.0 | google/or-tools | Makefile: Update Gflags |
261,218 | 23.04.2018 17:16:35 | -7,200 | e3a9fdf8fd58e850226affc0bad2cfc320bb620a | Makefile: Update Glog | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "makefiles/Makefile.third_party.unix.mk",
"diff": "@@ -103,6 +103,32 @@ GFLAGS_INC = -I$(UNIX_GFLAGS_DIR)/include\nSTATIC_GFLAGS_LNK = $(UNIX_GFLAGS_DIR)/lib/libgflags.a\nDYNAMIC_GFLAGS_LNK = -L$(UNIX_GFLAGS... | C++ | Apache License 2.0 | google/or-tools | Makefile: Update Glog |
261,218 | 23.04.2018 17:13:32 | -7,200 | f2ed981bec446eb27b5ea3621b0b9263f7d98fe5 | Makefile: Update Protobuf | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "makefiles/Makefile.third_party.unix.mk",
"diff": "@@ -129,6 +129,10 @@ GLOG_INC = -I$(UNIX_GLOG_DIR)/include\nSTATIC_GLOG_LNK = $(UNIX_GLOG_DIR)/lib/libglog.a\nDYNAMIC_GLOG_LNK = -L$(UNIX_GLOG_DIR)/lib -lgl... | C++ | Apache License 2.0 | google/or-tools | Makefile: Update Protobuf |
261,218 | 23.04.2018 17:17:50 | -7,200 | a2a84b5e18f23aab40cafb9e96b1cee3e33a7176 | Makefile: Update Coin | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "makefiles/Makefile.third_party.unix.mk",
"diff": "@@ -8,8 +8,11 @@ help_third_party:\nUNIX_GFLAGS_DIR ?= $(OR_TOOLS_TOP)/dependencies/install\nUNIX_GLOG_DIR ?= $(OR_TOOLS_TOP)/dependencies/install\nUNIX_PRO... | C++ | Apache License 2.0 | google/or-tools | Makefile: Update Coin |
261,218 | 25.04.2018 11:28:53 | -7,200 | 7dcc56b53984f930de3af162db7d2f6618422565 | Update Makefile.local doc | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "makefiles/Makefile.third_party.unix.mk",
"diff": "@@ -355,6 +355,8 @@ makefile_third_party: Makefile.local\nMakefile.local: makefiles/Makefile.third_party.unix.mk\n-$(DEL) Makefile.local\n@echo Generating M... | C++ | Apache License 2.0 | google/or-tools | Update Makefile.local doc |
261,218 | 25.04.2018 16:31:15 | -7,200 | 8b34288ea017b456971ad48d960bc70236a3d162 | Makefile.cpp: fix .PHONY | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.cpp.mk",
"new_path": "makefiles/Makefile.cpp.mk",
"diff": "@@ -10,8 +10,6 @@ else\n@echo\nendif\n-.PHONY: ccc rcc clean_cc clean_compat ccexe\n-\n# Main target\n.PHONY: cc # Build C++ OR-Tools.\ncc: ortoolslibs ccexe\n@@ -197,6 +195,7 @@ cle... | C++ | Apache License 2.0 | google/or-tools | Makefile.cpp: fix .PHONY |
261,218 | 25.04.2018 16:32:46 | -7,200 | 88639db551355f1e0f39aa8cc7531f3a3ce3c673 | Makefile: Update detect_cc recipe | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.cpp.mk",
"new_path": "makefiles/Makefile.cpp.mk",
"diff": "@@ -808,18 +808,15 @@ detect_cc:\n@echo OR_TOOLS_LNK = $(OR_TOOLS_LNK)\n@echo OR_TOOLS_LD_FLAGS = $(OR_TOOLS_LD_FLAGS)\n@echo DEPENDENCIES_LNK = $(DEPENDENCIES_LNK)\n-ifeq ($(SYSTEM)... | C++ | Apache License 2.0 | google/or-tools | Makefile: Update detect_cc recipe |
261,218 | 25.04.2018 16:51:42 | -7,200 | f3fd8aa995a85b90d48807e77fc262997be6031e | Makefile: add COPYREC | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.unix.mk",
"new_path": "makefiles/Makefile.unix.mk",
"diff": "@@ -31,6 +31,7 @@ S = /\nCPSEP = :\nCOPY = cp\n+COPYREC = cp -r\nDEL = rm -f\nDELREC = rm -rf\nGREP = grep\n"
},
{
"change_type": "MODIFY",
"old_path": "makefiles/Makef... | C++ | Apache License 2.0 | google/or-tools | Makefile: add COPYREC |
261,218 | 25.04.2018 16:52:01 | -7,200 | db17e75c48da7781f49a70506b8c98dc92047798 | Rework install_cc recipe | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -27,6 +27,7 @@ objs/\ntemp/\ntemp-python*\nlib/\n+install/\nexamples/csharp/solution/*.csproj\nexamples/csharp/*.sln\nexamples/notebook/.ipynb_checkpoints\n"
},
{
"change_type": "MODIFY",
"old_path... | C++ | Apache License 2.0 | google/or-tools | Rework install_cc recipe |
261,218 | 26.04.2018 11:17:43 | -7,200 | 67022b551c396341d3c7a7ca612b28e41e6032b6 | Makefile.archive: remove uneeded prerequisites
java_archive already depends on java
dotnet_archive already depends on csharp | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.archive.mk",
"new_path": "makefiles/Makefile.archive.mk",
"diff": "archive: $(INSTALL_DIR)$(ARCHIVE_EXT)\n-$(INSTALL_DIR)$(ARCHIVE_EXT): $(LIB_DIR)$S$(LIB_PREFIX)ortools.$(LIB_SUFFIX) csharp java create_dirs cc_archive dotnet_archive java_ar... | C++ | Apache License 2.0 | google/or-tools | Makefile.archive: remove uneeded prerequisites
- java_archive already depends on java
- dotnet_archive already depends on csharp |
261,218 | 26.03.2018 17:56:54 | -7,200 | fe9ddb78c854855ac33513fa7d655b829c5871b6 | Rework cvrptw.py
Try to use plausible data (e.g. currently, vehicles move at 36,000km/h...) | [
{
"change_type": "MODIFY",
"old_path": "examples/python/cvrptw.py",
"new_path": "examples/python/cvrptw.py",
"diff": "# This Python file uses the following encoding: utf-8\n# Copyright 2015 Tin Arm Engineering AB\n+# Copyright 2017 Google LLC\n# Licensed under the Apache License, Version 2.0 (the \"... | C++ | Apache License 2.0 | google/or-tools | Rework cvrptw.py
Try to use plausible data (e.g. currently, vehicles move at 36,000km/h...) |
261,218 | 27.04.2018 17:40:25 | -7,200 | 19aae6c5bd843ecf8ecac267a3f729c0b24ad3d5 | Add missing enum to java MPSolverParameters (Fix | [
{
"change_type": "MODIFY",
"old_path": "ortools/linear_solver/java/linear_solver.i",
"new_path": "ortools/linear_solver/java/linear_solver.i",
"diff": "@@ -249,11 +249,49 @@ import java.lang.reflect.*;\n// TODO(user): unit test all of it.\n%unignore operations_research::MPSolverParameters; // no tes... | C++ | Apache License 2.0 | google/or-tools | Add missing enum to java MPSolverParameters (Fix #97) |
261,218 | 27.04.2018 18:10:59 | -7,200 | e452a83dc40b02b2cc93117ea5b94dd38cec278d | Add missing enum to Python MPSolverParameters (Fix | [
{
"change_type": "MODIFY",
"old_path": "ortools/linear_solver/python/linear_solver.i",
"new_path": "ortools/linear_solver/python/linear_solver.i",
"diff": "@@ -298,16 +298,50 @@ from ortools.linear_solver.linear_solver_natural_api import VariableExpr\n// TODO(user): also strip \"MP\" from the class ... | C++ | Apache License 2.0 | google/or-tools | Add missing enum to Python MPSolverParameters (Fix #97) |
261,218 | 02.05.2018 09:54:34 | -7,200 | b385229297f8188e35584fb991daef5ed5480f7d | Makefile: Remove *.pyc when calling cleaning (Fix
now, `make clean` remove *.pyc files in ortools/ | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.python.mk",
"new_path": "makefiles/Makefile.python.mk",
"diff": "@@ -98,14 +98,23 @@ clean_python:\n-$(DELREC) $(GEN_DIR)$Sortools$Ssat$S__pycache__\n-$(DELREC) $(GEN_DIR)$Sortools$Sutil$S__pycache__\n-$(DELREC) ortools$S__pycache__\n+ -$(DE... | C++ | Apache License 2.0 | google/or-tools | Makefile: Remove *.pyc when calling cleaning (Fix #676)
- now, `make clean` remove *.pyc files in ortools/ |
261,252 | 02.05.2018 22:56:06 | 18,000 | 181972724b2b0215eba4e097fb844851438083f9 | Fix comments of the SequenceVar Rank functions
Make comments regarding RankLast and RankNotLast coherent, they had the RankFirst and RankNotFirst descriptions. | [
{
"change_type": "MODIFY",
"old_path": "ortools/constraint_solver/constraint_solver.h",
"new_path": "ortools/constraint_solver/constraint_solver.h",
"diff": "@@ -4615,11 +4615,11 @@ class SequenceVar : public PropagationBaseObject {\n// of all currently unranked interval vars.\nvoid RankNotFirst(int... | C++ | Apache License 2.0 | google/or-tools | Fix comments of the SequenceVar Rank functions
Make comments regarding RankLast and RankNotLast coherent, they had the RankFirst and RankNotFirst descriptions. |
261,297 | 03.05.2018 21:38:48 | -28,800 | e95fee9a63dabaca2824ceb0f4b85a0939ff2fb9 | Fix variable misused. | [
{
"change_type": "MODIFY",
"old_path": "examples/python/nurses_cp.py",
"new_path": "examples/python/nurses_cp.py",
"diff": "@@ -24,7 +24,7 @@ def main():\nfor j in range(num_shifts):\nfor i in range(num_days):\n- nurses[(j, i)] = solver.IntVar(0, num_shifts - 1, \"shift%d day%d\" % (j,i))\n+ nurses[... | C++ | Apache License 2.0 | google/or-tools | Fix variable misused. |
261,218 | 04.05.2018 09:58:59 | -7,200 | b44277aff6e2fe42ac1afad34f686ce3898b456d | Fix protoc call on windows
Need to use PROTOBUF_PROTOC_INC instead of PROTOBUF_INC
because protoc don't understand /Ipath windows style for include dirs | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.gen.mk",
"new_path": "makefiles/Makefile.gen.mk",
"diff": "@@ -597,7 +597,7 @@ $(OBJ_DIR)/util/xml_helper.$O: \\\n$(GEN_DIR)/ortools/util/optional_boolean.pb.cc: \\\n$(SRC_DIR)/ortools/util/optional_boolean.proto\n- $(PROTOBUF_DIR)/bin/proto... | C++ | Apache License 2.0 | google/or-tools | Fix protoc call on windows
Need to use PROTOBUF_PROTOC_INC instead of PROTOBUF_INC
because protoc don't understand /Ipath windows style for include dirs |
261,230 | 15.05.2018 14:04:53 | -7,200 | cb1fc93b94ecda90518b154a8b66b38b7fbce59e | fix wedding_optimal_chart_sat.py | [
{
"change_type": "MODIFY",
"old_path": "examples/python/wedding_optimal_chart.py",
"new_path": "examples/python/wedding_optimal_chart.py",
"diff": "@@ -51,14 +51,14 @@ def main():\n#\n# Easy problem (from the paper)\n- n = 2 # number of tables\n- a = 10 # maximum number of guests a table can seat\n-... | C++ | Apache License 2.0 | google/or-tools | fix wedding_optimal_chart_sat.py |
261,230 | 16.05.2018 13:43:29 | -7,200 | 9402f58d1d28b2b3366b0e0229813c15d771df40 | change sat internal API; stop ignoring random seed in glop | [
{
"change_type": "MODIFY",
"old_path": "examples/python/wedding_optimal_chart_sat.py",
"new_path": "examples/python/wedding_optimal_chart_sat.py",
"diff": "@@ -71,7 +71,7 @@ class WeddingChartPrinter(cp_model.CpSolverSolutionCallback):\nreturn self.__solution_count\n-def main():\n+def BuildData():\n... | C++ | Apache License 2.0 | google/or-tools | change sat internal API; stop ignoring random seed in glop |
261,230 | 18.05.2018 13:45:49 | -7,200 | 3e401080f90c224ccc1fd0e1eb653d9f8d4c5f71 | [SAT] preprocess tasks with 0-1 demands in cumulative as optional tasks; fix scheduling code with optional intervals | [
{
"change_type": "MODIFY",
"old_path": "ortools/flatzinc/cp_model_fz_solver.cc",
"new_path": "ortools/flatzinc/cp_model_fz_solver.cc",
"diff": "@@ -537,8 +537,20 @@ void CpModelProtoWithMapping::FillConstraint(const fz::Constraint& fz_ct,\narg->set_capacity(capacity);\nfor (int i = 0; i < starts.siz... | C++ | Apache License 2.0 | google/or-tools | [SAT] preprocess tasks with 0-1 demands in cumulative as optional tasks; fix scheduling code with optional intervals |
261,230 | 22.05.2018 13:13:52 | -7,200 | bd106059e5198909e2020cfd745a09f1317adf73 | support assembly scheduling in the jobshop_scheduling.proto and corresponding examples/cpp/jobshop_sat.cc | [
{
"change_type": "MODIFY",
"old_path": "examples/cpp/jobshop_sat.cc",
"new_path": "examples/cpp/jobshop_sat.cc",
"diff": "#include \"ortools/data/jobshop_scheduling_parser.h\"\n#include \"ortools/sat/cp_model.pb.h\"\n#include \"ortools/sat/cp_model_solver.h\"\n+#include \"ortools/sat/cp_model_utils.... | C++ | Apache License 2.0 | google/or-tools | support assembly scheduling in the jobshop_scheduling.proto and corresponding examples/cpp/jobshop_sat.cc |
261,230 | 22.05.2018 15:07:11 | -7,200 | a6ec503faf625d1e8e2ef9e6d28cd3e2e4d47e3e | initial set of recipes for the SAT solver | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "ortools/sat/doc/boolean_logic.md",
"diff": "+# Boolean logic recipes for the CP-SAT solver.\n+\n+\n+[TOC]\n+\n+\n+## Introduction\n+\n+The CP-SAT solver can express boolean variables and constraints.\n"
},
{
"change_type": "ADD",
"ol... | C++ | Apache License 2.0 | google/or-tools | initial set of recipes for the SAT solver |
261,230 | 22.05.2018 15:51:08 | -7,200 | 81cd0b4b13662f43cfa8ad23de332042c0883ac1 | add readme file to the sat directory | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "ortools/sat/README.md",
"diff": "+# CP/SAT\n+\n+This directory contains a next-gen Constraint Programming (CP) solver with\n+clause learning. It is built on top of an efficient SAT/max-SAT solver whose\n+code is also in this directory.\n+\n+To b... | C++ | Apache License 2.0 | google/or-tools | add readme file to the sat directory |
261,230 | 22.05.2018 17:13:52 | -7,200 | 41c1ae1c1507fb65ff6e441ebe4428d5b4e2f2d3 | speed up the disjunctive constraint in SAT | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/disjunctive.cc",
"new_path": "ortools/sat/disjunctive.cc",
"diff": "@@ -143,13 +143,6 @@ void TaskSet::AddEntry(const Entry& e) {\nif (j <= optimized_restart_) optimized_restart_ = 0;\n}\n-void TaskSet::AddOrderedLastEntry(const Entry& e) {\n- if (... | C++ | Apache License 2.0 | google/or-tools | speed up the disjunctive constraint in SAT |
261,230 | 24.05.2018 13:11:49 | -7,200 | be0c217682db98a00a8d97c5e2ce0ad751853d56 | continue working on sat cookbook | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/doc/boolean_logic.md",
"new_path": "ortools/sat/doc/boolean_logic.md",
"diff": "## Introduction\n-The CP-SAT solver can express boolean variables and constraints.\n+The CP-SAT solver can express boolean variables and constraints. A **boolean\n+vari... | C++ | Apache License 2.0 | google/or-tools | continue working on sat cookbook |
261,230 | 25.05.2018 11:15:15 | -7,200 | 4c1dc11cab8470899092e005817ca4f36555233f | fix bug in reservoir checker [SAT] | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/cp_model_checker.cc",
"new_path": "ortools/sat/cp_model_checker.cc",
"diff": "@@ -691,7 +691,7 @@ class ConstraintChecker {\nbool ReservoirConstraintIsFeasible(const ConstraintProto& ct) {\nconst int num_variables = ct.reservoir().times_size();\nco... | C++ | Apache License 2.0 | google/or-tools | fix bug in reservoir checker [SAT] |
261,218 | 25.05.2018 11:25:11 | -7,200 | b0f76a59ab5f3f60ae8014880eb56dc69996e4e2 | Travis-CI: Disable fsharp_test until fix is found | [
{
"change_type": "MODIFY",
"old_path": ".travis/script.sh",
"new_path": ".travis/script.sh",
"diff": "@@ -61,7 +61,9 @@ if [ \"${BUILDER}\" == make ];then\ncat Makefile.local\nmake third_party\nmake \"${LANGUAGE}\"\n+ if [ \"${LANGUAGE}\" != fsharp ]; then\nmake test_\"${LANGUAGE}\"\n+ fi\nelse\n# M... | C++ | Apache License 2.0 | google/or-tools | Travis-CI: Disable fsharp_test until fix is found (#701) |
261,230 | 25.05.2018 14:05:09 | -7,200 | e3fd57eb51f9347ec674ba7ab932983a43590942 | [SAT] check intermediate solution in debug mode, check solutions when presolve is off | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/cp_model_solver.cc",
"new_path": "ortools/sat/cp_model_solver.cc",
"diff": "@@ -2871,14 +2871,34 @@ CpSolverResponse SolveCpModel(const CpModelProto& model_proto, Model* model) {\n// Solve without presolving ?\nconst auto& observers = model->GetOrC... | C++ | Apache License 2.0 | google/or-tools | [SAT] check intermediate solution in debug mode, check solutions when presolve is off |
261,218 | 25.05.2018 14:38:06 | -7,200 | 7f57f2368ac9d151947c2f6efbbe3d99cbd7ace3 | Travis-CI: Disable fsharp target on osx until fix is found | [
{
"change_type": "MODIFY",
"old_path": ".travis/script.sh",
"new_path": ".travis/script.sh",
"diff": "@@ -60,8 +60,8 @@ if [ \"${BUILDER}\" == make ];then\nfi\ncat Makefile.local\nmake third_party\n- make \"${LANGUAGE}\"\nif [ \"${LANGUAGE}\" != fsharp ]; then\n+ make \"${LANGUAGE}\"\nmake test_\"${... | C++ | Apache License 2.0 | google/or-tools | Travis-CI: Disable fsharp target on osx until fix is found (#701) |
261,218 | 25.05.2018 14:21:32 | -7,200 | 97401ea17aecbced901a51b264b7d2c2153a3903 | Update C# and F# compiler management | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.csharp.mk",
"new_path": "makefiles/Makefile.csharp.mk",
"diff": "@@ -12,16 +12,20 @@ endif\n# Check for required build tools\nifeq ($(SYSTEM),win)\n-CSHARP_COMPILER ?= csc.exe\nifneq ($(PATH_TO_CSHARP_COMPILER),)\nCSHARP_EXECUTABLE := $(PATH... | C++ | Apache License 2.0 | google/or-tools | Update C# and F# compiler management |
261,218 | 25.05.2018 14:44:56 | -7,200 | 8c303ccac010b4fe90d506c75c24fc5bdb77807f | Fix FSharp project | [
{
"change_type": "MODIFY",
"old_path": "ortools/fsharp/OrTools.FSharp/OrTools.FSharp.fsproj",
"new_path": "ortools/fsharp/OrTools.FSharp/OrTools.FSharp.fsproj",
"diff": "<ItemGroup>\n<Compile Include=\"OrTools.fs\" />\n</ItemGroup>\n+ <ItemGroup Condition=\" '$(TargetFramework)' == 'net462' \">\n+ <... | C++ | Apache License 2.0 | google/or-tools | Fix FSharp project |
261,218 | 25.05.2018 16:51:19 | -7,200 | 6110b5ad72ff7fcb80e89a16f94c8b828e88b3ca | fsharp: update error message when dotnet not found | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.fsharp.mk",
"new_path": "makefiles/Makefile.fsharp.mk",
"diff": "@@ -50,7 +50,7 @@ ifneq ($(DOTNET_EXECUTABLE),)\n$(SED) -i -e \"s/0.0.0.0/$(OR_TOOLS_VERSION)/\" ortools$Sfsharp$S$(FSHARP_ORTOOLS_DLL_NAME)$S$(FSHARP_ORTOOLS_DLL_NAME).fsproj\... | C++ | Apache License 2.0 | google/or-tools | fsharp: update error message when dotnet not found |
261,218 | 25.05.2018 17:00:33 | -7,200 | fa81b14e7cc43e899358aa7ba827a392eec97ed4 | Fix Travis-CI fsharp on MacOS (Fix | [
{
"change_type": "MODIFY",
"old_path": ".travis/install.sh",
"new_path": ".travis/install.sh",
"diff": "@@ -73,11 +73,9 @@ if [ \"${BUILDER}\" == make ]; then\nelif [ \"${LANGUAGE}\" == java ]; then\nbrew cask install java;\nelif [ \"${LANGUAGE}\" == csharp ] || [ \"${LANGUAGE}\" == fsharp ]; then\n... | C++ | Apache License 2.0 | google/or-tools | Fix Travis-CI fsharp on MacOS (Fix #701) |
261,230 | 26.05.2018 00:03:08 | -7,200 | eb8a9d45f86f679d5f1aed7a50959cf3934c8153 | [SAT] fix bug in lp scaling | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/linear_programming_constraint.cc",
"new_path": "ortools/sat/linear_programming_constraint.cc",
"diff": "@@ -271,8 +271,11 @@ bool LinearProgrammingConstraint::Propagate() {\nlp_data_.SetConstraintBounds(row, cut.lb, cut.ub);\nfor (int i = 0; i < cu... | C++ | Apache License 2.0 | google/or-tools | [SAT] fix bug in lp scaling |
261,218 | 11.05.2018 11:18:03 | -7,200 | fe89f01c0ddf81b0ca898abd42864bdf777ed38e | Add comment to OBJ_OUT and EXE_OUT
useful when grepping these defs | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.unix.mk",
"new_path": "makefiles/Makefile.unix.mk",
"diff": "@@ -25,8 +25,8 @@ EXP=.exp\nARCHIVE_EXT = .tar.gz\nFZ_EXE = fzn-or-tools$E\nLDOUT = -o # need the space.\n-OBJ_OUT = -o #\n-EXE_OUT = -o #\n+OBJ_OUT = -o # need the space\n+EXE_OUT... | C++ | Apache License 2.0 | google/or-tools | Add comment to OBJ_OUT and EXE_OUT
- useful when grepping these defs |
261,218 | 07.05.2018 11:19:36 | -7,200 | 0c2e38df6b696246564a6b069059f63f1d1174ec | Makefile: remove CD def
cd is available on all platform -> no need for a CD def | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.csharp.mk",
"new_path": "makefiles/Makefile.csharp.mk",
"diff": "@@ -678,11 +678,11 @@ nuget_archive: \\\n$(CLR_ORTOOLS_DLL_NAME).$(OR_TOOLS_VERSION).nupkg: \\\ntools\\$(ORTOOLS_NUSPEC_NAME)\n- $(CD) $(ORTOOLS_NUGET_DIR) && \"$(NUGET_EXECUTA... | C++ | Apache License 2.0 | google/or-tools | Makefile: remove CD def
cd is available on all platform -> no need for a CD def |
261,218 | 07.05.2018 11:21:12 | -7,200 | 51418e59f4b4b61b2ccb6ae3d10648e68eafb38d | Windows move macro WINDOWS_*_DIRS | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.win.mk",
"new_path": "makefiles/Makefile.third_party.win.mk",
"diff": "@@ -4,13 +4,28 @@ help_third_party:\n@tools\\grep.exe \"^.PHONY: .* #\" $(CURDIR)/makefiles/Makefile.third_party.win.mk | tools\\sed.exe \"s/\\.PHONY: \\(.*\\... | C++ | Apache License 2.0 | google/or-tools | Windows move macro WINDOWS_*_DIRS |
261,218 | 07.05.2018 11:21:52 | -7,200 | 571fed405c3e479dc1647b1d14b3b20f59d4caeb | Windows Makefile: generate Makefile.local before building third party | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.win.mk",
"new_path": "makefiles/Makefile.third_party.win.mk",
"diff": "@@ -33,7 +33,7 @@ TSVNCACHE_EXE = TSVNCache.exe\n# Main target.\n.PHONY: third_party # Build OR-Tools Prerequisite\n-third_party: build_third_party makefile_t... | C++ | Apache License 2.0 | google/or-tools | Windows Makefile: generate Makefile.local before building third party |
261,218 | 11.05.2018 11:13:21 | -7,200 | 6b36617506c9e09a35e5e73c476c90bad9aef35e | Makefile: Fix $S -> / in prerequisite
$S is for Makefile shell cmd not target or prerequisite syntax.
i.e. always use / in path. | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.cpp.mk",
"new_path": "makefiles/Makefile.cpp.mk",
"diff": "@@ -800,10 +800,10 @@ $(LIB_DIR)/$(LIB_PREFIX)ortools.$(LIB_SUFFIX): \\\n# compile and run C++ examples\n.PHONY: ccc\n-ccc: $(BIN_DIR)$S$(basename $(notdir $(EX)))$E\n+ccc: $(BIN_DIR... | C++ | Apache License 2.0 | google/or-tools | Makefile: Fix $S -> / in prerequisite
$S is for Makefile shell cmd not target or prerequisite syntax.
i.e. always use / in path. |
261,218 | 23.05.2018 13:35:52 | -7,200 | ff6d262617183e6fd869700b88a2588cd7098b4b | [PYTHON] Rework PYTHON_INC and PYTHON_LNK | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.unix.mk",
"new_path": "makefiles/Makefile.unix.mk",
"diff": "@@ -49,16 +49,14 @@ endif\n# This is needed to find python.h\nPYTHON_VERSION = $(UNIX_PYTHON_VER)\n+MAJOR_PYTHON_VERSION = $(shell python$(UNIX_PYTHON_VER) -c \"from sys import ver... | C++ | Apache License 2.0 | google/or-tools | [PYTHON] Rework PYTHON_INC and PYTHON_LNK |
261,218 | 22.05.2018 16:57:02 | -7,200 | 287acc6b5de227cb6fea084e51d9e355cfaf9f4a | [JAVA] Refactor test_java_examples target | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.test.mk",
"new_path": "makefiles/Makefile.test.mk",
"diff": "@@ -25,9 +25,14 @@ test_python_examples: python\n$(SET_PYTHONPATH) \"$(PYTHON_EXECUTABLE)\" $(EX_DIR)$Stests$Stest_lp_api.py\n.PHONY: test_java_examples\n-test_java_examples: java ... | C++ | Apache License 2.0 | google/or-tools | [JAVA] Refactor test_java_examples target |
261,230 | 30.05.2018 06:37:34 | 25,200 | df52209c22a27134496578117e26dad6f2fbc3be | fix python compilation on mac with xcode supplied python | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.unix.mk",
"new_path": "makefiles/Makefile.unix.mk",
"diff": "@@ -58,6 +58,10 @@ PYTHON_INC = -I$(PATH_TO_PYTHON_INCLUDE) -I$(PATH_TO_PYTHON_LIB) $(ADD_PYTHON_IN\nPYTHON_INC += $(shell pkg-config --cflags python$(MAJOR_PYTHON_VERSION) 2> /dev... | C++ | Apache License 2.0 | google/or-tools | fix python compilation on mac with xcode supplied python |
261,230 | 30.05.2018 10:03:49 | 25,200 | ca579c649f8fa841f36b048ba6a55bddbcd7bac1 | add code samples in C++ for sat | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/cpp/code_samples_sat.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 | add code samples in C++ for sat |
261,230 | 30.05.2018 11:02:32 | 25,200 | 9a9e2e7741321262bd342d6281118c6358e75c65 | more doc on sat | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/doc/index.md",
"new_path": "ortools/sat/doc/index.md",
"diff": "@@ -8,3 +8,47 @@ by type:\n- [boolean logic](boolean_logic.md)\n- [integer arithmetic](integer_arithmetic.md)\n- [scheduling](scheduling.md)\n+- [searching for a solution](solver.md)\n... | C++ | Apache License 2.0 | google/or-tools | more doc on sat |
261,230 | 30.05.2018 14:31:59 | 25,200 | e19850592707dabfc105b5c5ace4d8bac599c2b6 | add C# samples to the SAT md doc | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/csharp/code_samples_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 | add C# samples to the SAT md doc |
261,230 | 30.05.2018 15:04:21 | 25,200 | 4cfa7e86a966d5cf3943fca7661c0cbcc3481096 | add more C# sat code samples + doc | [
{
"change_type": "MODIFY",
"old_path": "examples/csharp/code_samples_sat.cs",
"new_path": "examples/csharp/code_samples_sat.cs",
"diff": "@@ -44,6 +44,38 @@ public class VarArraySolutionPrinter : CpSolverSolutionCallback\nprivate IntVar[] variables_;\n}\n+public class VarArraySolutionPrinterWithObje... | C++ | Apache License 2.0 | google/or-tools | add more C# sat code samples + doc |
261,230 | 30.05.2018 15:36:34 | 25,200 | 773815c311f5c5efe72135f0185da933596c9faa | add C# code for boolean logic doc section | [
{
"change_type": "MODIFY",
"old_path": "examples/csharp/code_samples_sat.cs",
"new_path": "examples/csharp/code_samples_sat.cs",
"diff": "@@ -87,6 +87,13 @@ public class CodeSamplesSat\nIntVar x = model.NewBoolVar(\"x\");\n}\n+ static void LiteralSample()\n+ {\n+ CpModel model = new CpModel();\n+ In... | C++ | Apache License 2.0 | google/or-tools | add C# code for boolean logic doc section |
261,230 | 30.05.2018 15:53:15 | 25,200 | 2aea799b3ad266f1fe831242582de69eaec3d34a | more boolean C# doc | [
{
"change_type": "MODIFY",
"old_path": "examples/csharp/code_samples_sat.cs",
"new_path": "examples/csharp/code_samples_sat.cs",
"diff": "@@ -94,6 +94,34 @@ public class CodeSamplesSat\nILiteral not_x = x.Not();\n}\n+ static void BoolOrSample()\n+ {\n+ CpModel model = new CpModel();\n+ IntVar x = mo... | C++ | Apache License 2.0 | google/or-tools | more boolean C# doc |
261,218 | 31.05.2018 10:45:00 | -7,200 | 9b55324fd29bbb32104810a71951736cc24bb9f4 | Fix cvrptw.py (Fix | [
{
"change_type": "MODIFY",
"old_path": "examples/python/cvrptw.py",
"new_path": "examples/python/cvrptw.py",
"diff": "@@ -247,11 +247,25 @@ def add_time_window_constraints(routing, data, time_evaluator):\ntime_evaluator,\nhorizon, # allow waiting time\nhorizon, # maximum time per vehicle\n- True, # ... | C++ | Apache License 2.0 | google/or-tools | Fix cvrptw.py (Fix #708) |
261,218 | 31.05.2018 11:49:48 | -7,200 | efc46ca1bf7ee9dd3e95b5515a0171f8ebe0dbff | Add documentation to C++ and Python Package
For C++ doc:
/usr/share/doc/ortools
ref:
For Python doc:
ref:
ref:
/!\ Please not bdist_wheel command ignore MANIFEST.in and
there is no 'doc_dir' option in class Distribution cf. | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.cpp.mk",
"new_path": "makefiles/Makefile.cpp.mk",
"diff": "@@ -840,8 +840,9 @@ rcc: $(BIN_DIR)/$(basename $(notdir $(EX)))$E\n# ref: https://www.gnu.org/prep/standards/html_node/DESTDIR.html\ninstall_dirs:\n-$(MKDIR) \"$(DESTDIR)$(prefix)\"\... | C++ | Apache License 2.0 | google/or-tools | Add documentation to C++ and Python Package
For C++ doc:
/usr/share/doc/ortools
ref: https://www.debian.org/doc/manuals/debian-reference/debian-reference.en.txt
For Python doc:
ref: https://www.python.org/dev/peps/pep-0427/#the-data-directory
ref: https://www.python.org/dev/peps/pep-0491/#install-paths
/!\ Please not bdist_wheel command ignore MANIFEST.in and
there is no 'doc_dir' option in class Distribution cf.
https://github.com/pypa/setuptools/blob/master/setuptools/dist.py |
261,230 | 31.05.2018 10:51:33 | 25,200 | 404e4c571788641d394001fa4abb6caca6926d03 | relaxed checks on optional intervals in python CP-SAT | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/python/cp_model.py",
"new_path": "ortools/sat/python/cp_model.py",
"diff": "@@ -829,8 +829,6 @@ class CpModel(object):\nstart_index = self.GetOrMakeOptionalIndex(start, is_present)\nsize_index = self.GetOrMakeIndex(size) # Currently, not optional.\... | C++ | Apache License 2.0 | google/or-tools | relaxed checks on optional intervals in python CP-SAT |
261,230 | 31.05.2018 10:52:07 | 25,200 | 333a0048786d458c076c4d8978f0c4e83cccdd97 | flexible jobshop examples in python CP-SAT | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/python/flexible_job_shop_sat.py",
"diff": "+from __future__ import print_function\n+\n+from collections import defaultdict\n+from ortools.sat.python import cp_model\n+import time\n+\n+\n+class SolutionPrinter(cp_model.CpSolverSolutionCa... | C++ | Apache License 2.0 | google/or-tools | flexible jobshop examples in python CP-SAT |
261,230 | 31.05.2018 10:54:36 | 25,200 | 1fac6dcd738f69bb4a8e6028c0f87ece2ca45436 | add licenses to examples | [
{
"change_type": "MODIFY",
"old_path": "examples/python/flexible_job_shop_sat.py",
"new_path": "examples/python/flexible_job_shop_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 w... | C++ | Apache License 2.0 | google/or-tools | add licenses to examples |
261,230 | 31.05.2018 14:50:12 | 25,200 | 2a51c65e9799040247e3049ea8b8685ff94984a4 | expand cp_model.py to offer more API on the solution callback; simplify flexible_jobshop_sat.py | [
{
"change_type": "MODIFY",
"old_path": "examples/python/flexible_job_shop_sat.py",
"new_path": "examples/python/flexible_job_shop_sat.py",
"diff": "@@ -15,7 +15,6 @@ from __future__ import print_function\nfrom collections import defaultdict\nfrom ortools.sat.python import cp_model\n-import time\ncla... | C++ | Apache License 2.0 | google/or-tools | expand cp_model.py to offer more API on the solution callback; simplify flexible_jobshop_sat.py |
261,218 | 01.06.2018 17:31:36 | -7,200 | 7dda497960038700d20f6aa0e3f075ea1e9e67a5 | Fix all remaining StrAppend -> absl::StrAppend | [
{
"change_type": "MODIFY",
"old_path": "examples/cpp/tsp.cc",
"new_path": "examples/cpp/tsp.cc",
"diff": "@@ -147,11 +147,11 @@ void Tsp() {\nstd::string route;\nfor (int64 node = routing.Start(route_number); !routing.IsEnd(node);\nnode = solution->Value(routing.NextVar(node))) {\n- StrAppend(&route... | C++ | Apache License 2.0 | google/or-tools | Fix all remaining StrAppend -> absl::StrAppend |
261,218 | 02.06.2018 02:34:51 | -7,200 | d6fd74b4c9c80f08e4c5c3b3fe4b4e7297aa5c33 | Fixing all remaining StrCat -> absl::StrCat | [
{
"change_type": "MODIFY",
"old_path": "examples/cpp/cvrptw_with_breaks.cc",
"new_path": "examples/cpp/cvrptw_with_breaks.cc",
"diff": "@@ -143,7 +143,7 @@ int main(int argc, char** argv) {\nsolver->MakeFixedDurationIntervalVar(\nbreak_data[i][0] * 3600, break_data[i][1] * 3600,\nbreak_data[i][2], t... | C++ | Apache License 2.0 | google/or-tools | Fixing all remaining StrCat -> absl::StrCat |
261,218 | 04.06.2018 08:41:31 | -7,200 | 4bdd18b400149ddbd56cf742c07ee3145401bbeb | Update swig_helper.h | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/swig_helper.h",
"new_path": "ortools/sat/swig_helper.h",
"diff": "@@ -23,7 +23,7 @@ namespace operations_research {\nnamespace sat {\n// Base class for SWIG director based on solution callbacks.\n-// See http://www.i.org/Doc3.0/SWIGDocumentation.ht... | C++ | Apache License 2.0 | google/or-tools | Update swig_helper.h |
261,218 | 04.06.2018 10:14:39 | -7,200 | 12a4cee80720e680422a7541ef8f22a74f8e4586 | Remove the use of rm on windows | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.win.mk",
"new_path": "makefiles/Makefile.win.mk",
"diff": "@@ -52,7 +52,7 @@ WHICH = tools\\which.exe\n# We Can't force SHELL to cmd.exe if sh.exe is in the PATH\n# cf https://www.gnu.org/software/make/manual/html_node/Choosing-the-Shell.htm... | C++ | Apache License 2.0 | google/or-tools | Remove the use of rm on windows |
261,218 | 04.06.2018 10:20:25 | -7,200 | 185b62c9973d83b2375091390a2ebd7b368d5292 | Update Makefile.win.mk | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.win.mk",
"new_path": "makefiles/Makefile.win.mk",
"diff": "@@ -52,7 +52,7 @@ WHICH = tools\\which.exe\n# We Can't force SHELL to cmd.exe if sh.exe is in the PATH\n# cf https://www.gnu.org/software/make/manual/html_node/Choosing-the-Shell.htm... | C++ | Apache License 2.0 | google/or-tools | Update Makefile.win.mk |
261,230 | 04.06.2018 11:59:33 | -7,200 | ea0d59e130562e7b7315ff0926861c8e27bccb33 | minor improvements to sat solver; continue working on SAT cookbook | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/cp_model_checker.cc",
"new_path": "ortools/sat/cp_model_checker.cc",
"diff": "@@ -158,8 +158,8 @@ std::string ValidateLinearConstraint(const CpModelProto& model,\n// Note that we use min/max with zero to disallow \"alternative\" terms and\n// be su... | C++ | Apache License 2.0 | google/or-tools | minor improvements to sat solver; continue working on SAT cookbook |
261,218 | 04.06.2018 17:22:28 | -7,200 | c59f4e8a84a118651457a21ce26acf3e5a08d981 | Add missing util/*.pb.h to install rules | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.archive.mk",
"new_path": "makefiles/Makefile.archive.mk",
"diff": "@@ -105,7 +105,7 @@ cc_archive: cc\n$(COPY) ortools$Ssat$S*.h temp$S$(INSTALL_DIR)$Sinclude$Sortools$Ssat\n$(COPY) ortools$Sgen$Sortools$Ssat$S*.pb.h temp$S$(INSTALL_DIR)$Sin... | C++ | Apache License 2.0 | google/or-tools | Add missing util/*.pb.h to install rules |
261,230 | 04.06.2018 17:44:18 | -7,200 | 78743bdb1c63677bd0964b35e44eae288d60cfdc | fix bug when solving without presolve | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/integer.cc",
"new_path": "ortools/sat/integer.cc",
"diff": "@@ -100,7 +100,7 @@ void IntegerEncoder::FullyEncodeVariable(IntegerVariable var) {\nAssociateToIntegerEqualValue(literals[i], var, values[i]);\n}\n- // Mark var and of Negation(var) as fu... | C++ | Apache License 2.0 | google/or-tools | fix bug when solving without presolve |
261,230 | 05.06.2018 14:03:01 | -7,200 | 211e6ab93f2dda80a191a1c644ad17a84243206b | more work on sat doc; fix rare bug in sat minor (doc; __str__) improvements to sat/python/cp_model.py | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/doc/boolean_logic.md",
"new_path": "ortools/sat/doc/boolean_logic.md",
"diff": "@@ -20,11 +20,12 @@ negation of 'x'.\n```python\nfrom ortools.sat.python import cp_model\n+def LiteralSample():\nmodel = cp_model.CpModel()\n-\nx = model.NewBoolVar('x'... | C++ | Apache License 2.0 | google/or-tools | more work on sat doc; fix rare bug in sat minor (doc; __str__) improvements to sat/python/cp_model.py |
261,230 | 05.06.2018 14:31:19 | -7,200 | 84ee2d946755e777549826641d171621ee2dc67a | create archive for data files separate from main binary archive | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.archive.mk",
"new_path": "makefiles/Makefile.archive.mk",
"diff": "archive: $(INSTALL_DIR)$(ARCHIVE_EXT)\n-$(INSTALL_DIR)$(ARCHIVE_EXT): $(LIB_DIR)$S$(LIB_PREFIX)ortools.$L create_dirs cc_archive dotnet_archive java_archive data_archive $(PA... | C++ | Apache License 2.0 | google/or-tools | create archive for data files separate from main binary archive |
261,218 | 05.06.2018 14:43:31 | -7,200 | 889c97d589760ab42f4ad3540a0872f1873d11da | Bump minimum mono version to 5.4 | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.port.mk",
"new_path": "makefiles/Makefile.port.mk",
"diff": "@@ -78,7 +78,7 @@ ifeq ($(SYSTEM),unix)\n# Look at mono compiler.\nREAL_MCS = $(shell which mcs)\n- MINIMUM_REQUIRED_MCS_VERSION = 4.2\n+ MINIMUM_REQUIRED_MCS_VERSION = 5.4\nifneq ... | C++ | Apache License 2.0 | google/or-tools | Bump minimum mono version to 5.4 |
261,218 | 05.06.2018 14:44:28 | -7,200 | 18c1fdd7a740139e9e6ee8be0a0ac538fc44a485 | Fix mono name on OSX in archive Makefile (Fix | [
{
"change_type": "MODIFY",
"old_path": "tools/Makefile.cc",
"new_path": "tools/Makefile.cc",
"diff": "@@ -72,7 +72,7 @@ ifeq (\"$(SYSTEM)\",\"unix\")\nARCH = -DARCH_K8\nPORT = MacOsX64\nCSC = mcs\n- MONO = DYLD_FALLBACK_LIBRARY_PATH=$(LIB_DIR):$(DYLD_LIBRARY_PATH) mono64\n+ MONO = DYLD_FALLBACK_LIBR... | C++ | Apache License 2.0 | google/or-tools | Fix mono name on OSX in archive Makefile (Fix #712) |
261,230 | 06.06.2018 10:38:37 | -7,200 | 3396f3a965c7f0906b31d2f7fc2ada2ce132146a | fix sat presolve in rare conditions | [
{
"change_type": "MODIFY",
"old_path": "ortools/sat/cp_model_presolve.cc",
"new_path": "ortools/sat/cp_model_presolve.cc",
"diff": "@@ -181,6 +181,8 @@ struct PresolveContext {\nint64 c = RefIsPositive(ref_x) == RefIsPositive(ref_y) ? coeff : -coeff;\nint64 o = RefIsPositive(ref_x) ? offset : -offse... | C++ | Apache License 2.0 | google/or-tools | fix sat presolve in rare conditions |
261,230 | 06.06.2018 14:24:38 | -7,200 | 6a929ca39d8ee4decd8f9ba839b5b1253d337e1b | channeling doc + ScalProd API on C# SAT | [
{
"change_type": "MODIFY",
"old_path": "ortools/com/google/ortools/sat/IntegerExpressions.cs",
"new_path": "ortools/com/google/ortools/sat/IntegerExpressions.cs",
"diff": "@@ -25,6 +25,22 @@ public static class IntVarArrayHelper\n{\nreturn new SumArray(vars);\n}\n+ public static SumArray ScalProd(th... | C++ | Apache License 2.0 | google/or-tools | channeling doc + ScalProd API on C# SAT |
261,230 | 06.06.2018 15:28:23 | -7,200 | bd060bc4008ce2a145b8a5f38049093c1b2a2d95 | more code samples for sat | [
{
"change_type": "MODIFY",
"old_path": "examples/cpp/code_samples_sat.cc",
"new_path": "examples/cpp/code_samples_sat.cc",
"diff": "@@ -168,6 +168,129 @@ void RabbitsAndPheasants() {\n}\n}\n+void BinpackingProblem() {\n+ // Data.\n+ const int kBinCapacity = 100;\n+ const int kSlackCapacity = 20;\n+ ... | C++ | Apache License 2.0 | google/or-tools | more code samples for sat |
261,218 | 06.06.2018 17:10:37 | -7,200 | 0378f82a4cfe0f2a5637c61c432ba241c548a17c | Add log for each dependencies found
Also sort them in build dependencies order
Should ease the support if someone has a missing dependencies or set
UNIX_XXX_DIR to a wrong path... | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "makefiles/Makefile.third_party.unix.mk",
"diff": "@@ -36,30 +36,48 @@ third_party: makefile_third_party build_third_party\nthird_party_check:\nifeq ($(wildcard $(UNIX_GFLAGS_DIR)/include/gflags/gflags.h),)\... | C++ | Apache License 2.0 | google/or-tools | Add log for each dependencies found
- Also sort them in build dependencies order
Should ease the support if someone has a missing dependencies or set
UNIX_XXX_DIR to a wrong path... |
261,230 | 07.06.2018 15:33:25 | -7,200 | 85339803e8b1bf99044031d4a3e74bd6c9b7eb44 | work on sat scheduling doc; fix C# code to accept optional interval vars without optional start and end variables; update code_samples with new code from doc | [
{
"change_type": "MODIFY",
"old_path": "examples/cpp/code_samples_sat.cc",
"new_path": "examples/cpp/code_samples_sat.cc",
"diff": "@@ -327,6 +327,48 @@ void IntervalSample() {\n<< \", interval_var = \" << interval_var;\n}\n+void OptionalIntervalSample() {\n+ CpModelProto cp_model;\n+ const int kHor... | C++ | Apache License 2.0 | google/or-tools | work on sat scheduling doc; fix C# code to accept optional interval vars without optional start and end variables; update code_samples with new code from doc |
261,230 | 08.06.2018 13:36:19 | -7,200 | 1ec337d9c041ed03960d3a9bfc3e50c076b573bd | fix weighted_tardiness_sat crash | [
{
"change_type": "MODIFY",
"old_path": "examples/cpp/weighted_tardiness_sat.cc",
"new_path": "examples/cpp/weighted_tardiness_sat.cc",
"diff": "@@ -212,14 +212,30 @@ void Solve(const std::vector<int>& durations, const std::vector<int>& due_dates,\nModel model;\nmodel.Add(NewSatParameters(FLAGS_param... | C++ | Apache License 2.0 | google/or-tools | fix weighted_tardiness_sat crash |
261,218 | 08.06.2018 17:50:41 | -7,200 | 209ab7cd1172bcec56783389b1ce9a2c1bd866cd | Replace CHECK_NOTNULL -> CHECK for caller ignoring the return value | [
{
"change_type": "MODIFY",
"old_path": "ortools/base/file.cc",
"new_path": "ortools/base/file.cc",
"diff": "@@ -98,7 +98,7 @@ char* File::ReadLine(char* const output, uint64 max_length) {\n}\nint64 File::ReadToString(std::string* const output, uint64 max_length) {\n- CHECK_NOTNULL(output);\n+ CHECK(... | C++ | Apache License 2.0 | google/or-tools | Replace CHECK_NOTNULL -> CHECK for caller ignoring the return value |
261,230 | 11.06.2018 11:50:49 | -7,200 | 92433a8e5defc0204c50b3927a5c0505070143da | minor refactoring of the code, mostly reindent | [
{
"change_type": "MODIFY",
"old_path": "ortools/algorithms/find_graph_symmetries.h",
"new_path": "ortools/algorithms/find_graph_symmetries.h",
"diff": "#include \"ortools/algorithms/dynamic_partition.h\"\n#include \"ortools/algorithms/dynamic_permutation.h\"\n#include \"ortools/base/status.h\"\n+#in... | C++ | Apache License 2.0 | google/or-tools | minor refactoring of the code, mostly reindent |
261,218 | 11.06.2018 17:28:45 | -7,200 | c4242084ed71e6d0f5b4db2963c7115701c12784 | Fix centos-7 protoc dependencies
On protobuf is installed in /usr/local/lib64... | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.third_party.unix.mk",
"new_path": "makefiles/Makefile.third_party.unix.mk",
"diff": "@@ -234,7 +234,7 @@ endif\n# Define Protoc\nifeq ($(PLATFORM),LINUX)\nPROTOC = \\\n-LD_LIBRARY_PATH=\"$(UNIX_PROTOBUF_DIR)/lib\":$(LD_LIBRARY_PATH) $(PROTOC... | C++ | Apache License 2.0 | google/or-tools | Fix centos-7 protoc dependencies
On Centos-7 protobuf is installed in /usr/local/lib64... |
261,230 | 15.06.2018 11:12:13 | -7,200 | fbb46bdc1bbe72fd00f7731b55d29c3ebf927515 | [SAT] new search options: fixed_restart, randomize_search, lns! | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.gen.mk",
"new_path": "makefiles/Makefile.gen.mk",
"diff": "@@ -1387,7 +1387,8 @@ $(SRC_DIR)/ortools/graph/util.h: \\\n$(SRC_DIR)/ortools/base/hash.h \\\n$(SRC_DIR)/ortools/base/map_util.h \\\n$(SRC_DIR)/ortools/graph/connected_components.h \... | C++ | Apache License 2.0 | google/or-tools | [SAT] new search options: fixed_restart, randomize_search, lns! |
261,230 | 15.06.2018 11:12:41 | -7,200 | e173530617ff86b4560e1f127f21abc928125614 | [FZ] parallel option if flatzinc sat | [
{
"change_type": "MODIFY",
"old_path": "ortools/flatzinc/cp_model_fz_solver.cc",
"new_path": "ortools/flatzinc/cp_model_fz_solver.cc",
"diff": "#include \"ortools/flatzinc/cp_model_fz_solver.h\"\n+#include <limits>\n#include <unordered_map>\n#include \"google/protobuf/text_format.h\"\n#include \"ort... | C++ | Apache License 2.0 | google/or-tools | [FZ] parallel option if flatzinc sat |
261,230 | 15.06.2018 11:40:37 | -7,200 | 7c8463e76a56c025da52bab9a3118394e056abe2 | fix fz compilation on mac | [
{
"change_type": "MODIFY",
"old_path": "makefiles/Makefile.cpp.mk",
"new_path": "makefiles/Makefile.cpp.mk",
"diff": "@@ -274,7 +274,7 @@ FLATZINC_DEPS = \\\n$(SAT_DEPS)\nFLATZINC_LNK = $(PRE_LIB)fz$(POST_LIB) $(OR_TOOLS_LNK)\nifeq ($(PLATFORM),MACOSX)\n-FLATZINK_LDFLAGS = -install_name @rpath/$(LIB... | C++ | Apache License 2.0 | google/or-tools | fix fz compilation on mac |
261,218 | 15.06.2018 15:12:35 | -7,200 | b4298ba31c32fde457c4814f012ee8480d9ca8a9 | Add test_fz for Travis-CI MacOS | [
{
"change_type": "MODIFY",
"old_path": ".travis/script.sh",
"new_path": ".travis/script.sh",
"diff": "@@ -73,6 +73,9 @@ if [ \"${BUILDER}\" == make ];then\nmake third_party\nmake \"${LANGUAGE}\"\nmake test_\"${LANGUAGE}\"\n+ if [ \"${LANGUAGE}\" == cc ]; then\n+ make test_fz\n+ fi\nelse\n# MacOS Doc... | C++ | Apache License 2.0 | google/or-tools | Add test_fz for Travis-CI MacOS |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.