Skip to content

Commit c9b7d58

Browse files
committed
plenty of minor format issues; fix one numerical issue with glop; improve cut management in CP-SAT; automatic tightening of big-M in CP-SAT
1 parent 7e8c147 commit c9b7d58

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+224
-202
lines changed

ortools/algorithms/dense_doubly_linked_list.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#define OR_TOOLS_ALGORITHMS_DENSE_DOUBLY_LINKED_LIST_H_
1616

1717
#include <vector>
18+
1819
#include "ortools/base/logging.h"
1920

2021
namespace operations_research {

ortools/algorithms/dynamic_partition.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
#include <string>
3434
#include <vector>
35+
3536
#include "ortools/base/logging.h"
3637

3738
namespace operations_research {

ortools/algorithms/dynamic_permutation.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "ortools/algorithms/dynamic_permutation.h"
1515

1616
#include <algorithm>
17+
1718
#include "ortools/algorithms/sparse_permutation.h"
1819

1920
namespace operations_research {

ortools/algorithms/hungarian.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#define OR_TOOLS_ALGORITHMS_HUNGARIAN_H_
3535

3636
#include <vector>
37+
3738
#include "absl/container/flat_hash_map.h"
3839

3940
namespace operations_research {

ortools/algorithms/knapsack_solver.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
#define OR_TOOLS_ALGORITHMS_KNAPSACK_SOLVER_H_
5959

6060
#include <math.h>
61+
6162
#include <memory>
6263
#include <string>
6364
#include <vector>

ortools/algorithms/sparse_permutation.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "ortools/algorithms/sparse_permutation.h"
1515

1616
#include <algorithm>
17+
1718
#include "absl/strings/str_join.h"
1819
#include "ortools/base/logging.h"
1920

ortools/base/adjustable_priority_queue.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <functional>
1515
#include <list>
1616
#include <vector>
17+
1718
#include "ortools/base/basictypes.h"
1819
#include "ortools/base/logging.h"
1920
#include "ortools/base/macros.h"

ortools/base/bitmap.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#define OR_TOOLS_BASE_BITMAP_H_
1616

1717
#include <string.h>
18+
1819
#include "ortools/base/basictypes.h"
1920

2021
namespace operations_research {

ortools/base/file.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
#include <sys/stat.h>
1515
#include <sys/types.h>
16+
1617
#include "absl/strings/str_cat.h"
1718
#if defined(_MSC_VER)
1819
#include <io.h>

ortools/base/int_type.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@
145145
#define OR_TOOLS_BASE_INT_TYPE_H_
146146

147147
#include <stddef.h>
148+
148149
#include <functional>
149150
#include <iosfwd>
150151
#include <ostream> // NOLINT

0 commit comments

Comments
 (0)