Skip to content

Commit 8e1dece

Browse files
committed
format fix
1 parent 9fa25b3 commit 8e1dece

File tree

9 files changed

+241
-148
lines changed

9 files changed

+241
-148
lines changed

.dockerignore

+2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ build_cross/
5858
build_make/
5959
install_make/
6060
temp_*/
61+
export/
62+
export_meta/
6163

6264
# Editor directories and files
6365
*.user

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ temp_cpp/
4141
temp_cpp_test/
4242
temp_dotnet/
4343
temp_dotnet_test/
44+
temp_meta_dotnet/
4445
temp_java/
4546
temp_java_test/
47+
temp_meta_java/
4648
temp_python*
4749
temp_python*_test/
4850
temp_archive/
@@ -57,6 +59,7 @@ or-tools.snk
5759
private-key.gpg
5860
settings.xml
5961
export
62+
export_meta
6063

6164
ortools/bazel-*
6265
examples/bazel-*

BUILD.bazel

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# Copyright 2010-2024 Google LLC
2+
# Licensed under the Apache License, Version 2.0 (the "License");
3+
# you may not use this file except in compliance with the License.
4+
# You may obtain a copy of the License at
5+
#
6+
# http://www.apache.org/licenses/LICENSE-2.0
7+
#
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
114
load("@bazel_gazelle//:def.bzl", "gazelle")
215

316
# gazelle:build_file_name BUILD,BUILD.bazel

deps.bzl

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# Copyright 2010-2024 Google LLC
2+
# Licensed under the Apache License, Version 2.0 (the "License");
3+
# you may not use this file except in compliance with the License.
4+
# You may obtain a copy of the License at
5+
#
6+
# http://www.apache.org/licenses/LICENSE-2.0
7+
#
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
114
load("@bazel_gazelle//:deps.bzl", "go_repository")
215

316
def go_dependencies():

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ module github.com/google/or-tools
33
go 1.22.2
44

55
require (
6-
github.com/golang/glog v1.2.2
7-
google.golang.org/protobuf v1.34.2
6+
github.com/golang/glog v1.2.2
7+
google.golang.org/protobuf v1.34.2
88
)

or-tools.code-workspace

+45-45
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"folders": [
3-
{
4-
"path": "."
5-
}
6-
],
7-
"settings": {
8-
"files.associations": {
2+
"folders": [
3+
{
4+
"path": "."
5+
}
6+
],
7+
"settings": {
8+
"files.associations": {
99
"scoped_allocator": "cpp",
1010
"*.inc": "cpp",
1111
"vector": "cpp",
@@ -96,49 +96,49 @@
9696
"slist": "cpp",
9797
"regex": "cpp"
9898
},
99-
"C_Cpp.clang_format_fallbackStyle": "Google",
100-
"C_Cpp.default.includePath": [
101-
"${workspaceRoot}",
102-
"${workspaceRoot}/ortools/gen",
103-
"${workspaceRoot}/dependencies/install/include",
104-
],
105-
"C_Cpp.default.cppStandard": "c++20",
106-
"C_Cpp.default.cStandard": "c11",
107-
"C_Cpp.default.defines": [
108-
"USE_BOP",
109-
"USE_GLOP",
110-
"USE_CLP",
111-
"USE_CBC",
112-
"USE_PDLP",
113-
"USE_SCIP"
114-
],
115-
"C_Cpp.clang_format_style": "Google",
116-
"python.formatting.provider": "yapf",
117-
"python.pythonPath": "python3",
118-
"python.autoComplete.extraPaths": [
119-
"${workspaceRoot}",
120-
"${workspaceRoot}/ortools/gen",
121-
"${workspaceRoot}/dependencies/sources/protobuf-3.6.1/python",
122-
],
123-
"[cpp]": {
124-
"editor.tabSize": 2,
125-
},
126-
"[csharp]": {
127-
"editor.tabSize": 2,
128-
},
129-
"[java]": {
130-
"editor.tabSize": 2,
131-
},
132-
"[python]": {
133-
"editor.tabSize": 4,
99+
"C_Cpp.clang_format_fallbackStyle": "Google",
100+
"C_Cpp.default.includePath": [
101+
"${workspaceRoot}",
102+
"${workspaceRoot}/ortools/gen",
103+
"${workspaceRoot}/dependencies/install/include",
104+
],
105+
"C_Cpp.default.cppStandard": "c++20",
106+
"C_Cpp.default.cStandard": "c11",
107+
"C_Cpp.default.defines": [
108+
"USE_BOP",
109+
"USE_GLOP",
110+
"USE_CLP",
111+
"USE_CBC",
112+
"USE_PDLP",
113+
"USE_SCIP"
114+
],
115+
"C_Cpp.clang_format_style": "Google",
116+
"python.formatting.provider": "yapf",
117+
"python.pythonPath": "python3",
118+
"python.autoComplete.extraPaths": [
119+
"${workspaceRoot}",
120+
"${workspaceRoot}/ortools/gen",
121+
"${workspaceRoot}/dependencies/sources/protobuf-3.6.1/python",
122+
],
123+
"[cpp]": {
124+
"editor.tabSize": 2,
125+
},
126+
"[csharp]": {
127+
"editor.tabSize": 2,
128+
},
129+
"[java]": {
130+
"editor.tabSize": 2,
131+
},
132+
"[python]": {
133+
"editor.tabSize": 4,
134134
},
135135
"java.configuration.updateBuildConfiguration": "interactive",
136136
"maven.view": "hierarchical",
137137
"git.ignoreLimitWarning": true,
138138
"python.analysis.extraPaths": [
139139
"${workspaceRoot}",
140-
"${workspaceRoot}/ortools/gen",
141-
"${workspaceRoot}/dependencies/sources/protobuf-3.6.1/python"
140+
"${workspaceRoot}/ortools/gen",
141+
"${workspaceRoot}/dependencies/sources/protobuf-3.6.1/python"
142142
],
143-
}
143+
}
144144
}

ortools/linear_solver/csharp/LinearSolverTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ void SolveAndPrint(in Solver solver, in Variable[] variables, in Constraint[] co
307307
foreach (Constraint ct in constraints)
308308
{
309309
output.WriteLine($"{ct.Name()}: dual value = {ct.DualValue()}",
310-
$" activity = {activities[ct.Index()]}");
310+
$" activity = {activities[ct.Index()]}");
311311
}
312312
}
313313
}

ortools/sat/csharp/SatSolverTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,6 @@ public void TestHint()
771771
Assert.Equal(0, model.Model.SolutionHint.Values[1]);
772772
Assert.Equal(2, model.Model.SolutionHint.Vars[2]);
773773
Assert.Equal(1, model.Model.SolutionHint.Values[2]);
774-
}
774+
}
775775
}
776776
} // namespace Google.OrTools.Tests

0 commit comments

Comments
 (0)