diff --git a/examples/com/google/ortools/constraintsolver/samples/RabbitsPheasants.java b/examples/com/google/ortools/constraintsolver/samples/RabbitsPheasants.java index a68976ac21..a314e520e8 100644 --- a/examples/com/google/ortools/constraintsolver/samples/RabbitsPheasants.java +++ b/examples/com/google/ortools/constraintsolver/samples/RabbitsPheasants.java @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/com/google/ortools/graph/samples/FlowExample.java b/examples/com/google/ortools/graph/samples/FlowExample.java index 54209bb138..c2eef5cd97 100644 --- a/examples/com/google/ortools/graph/samples/FlowExample.java +++ b/examples/com/google/ortools/graph/samples/FlowExample.java @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/com/google/ortools/graph/samples/LinearAssignmentAPI.java b/examples/com/google/ortools/graph/samples/LinearAssignmentAPI.java index 31bf08d3ee..c29c2d4d7b 100644 --- a/examples/com/google/ortools/graph/samples/LinearAssignmentAPI.java +++ b/examples/com/google/ortools/graph/samples/LinearAssignmentAPI.java @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/com/google/ortools/knapsacksolver/samples/Knapsack.java b/examples/com/google/ortools/knapsacksolver/samples/Knapsack.java index ad025a33b7..16db435d14 100644 --- a/examples/com/google/ortools/knapsacksolver/samples/Knapsack.java +++ b/examples/com/google/ortools/knapsacksolver/samples/Knapsack.java @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/com/google/ortools/linearsolver/samples/IntegerProgramming.java b/examples/com/google/ortools/linearsolver/samples/IntegerProgramming.java index 452d7fc554..540132ef95 100644 --- a/examples/com/google/ortools/linearsolver/samples/IntegerProgramming.java +++ b/examples/com/google/ortools/linearsolver/samples/IntegerProgramming.java @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/com/google/ortools/linearsolver/samples/LinearProgramming.java b/examples/com/google/ortools/linearsolver/samples/LinearProgramming.java index 5ca8e8bf90..8f41b4272a 100644 --- a/examples/com/google/ortools/linearsolver/samples/LinearProgramming.java +++ b/examples/com/google/ortools/linearsolver/samples/LinearProgramming.java @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/README b/examples/cpp/README index dc3e1ad7a8..1b76621d04 100644 --- a/examples/cpp/README +++ b/examples/cpp/README @@ -30,6 +30,7 @@ Operations Research libraries. - Routing examples: - tsp.cc Travelling Salesman Problem. - cvrptw.cc Capacitated Vehicle Routing Problem with Time Windows. + - carptw.cc Capacitated Vehicle Arc-Routing Problem with Time Windows. - pdptw.cc Pickup and Delivery Problem with Time Windows. - Graph examples: @@ -50,6 +51,10 @@ Operations Research libraries. demonstrates how to use dynamic column generation to solve a 2D covering problem. + - Examples using multiple technologies: + - warehouse_run.cc Solve a capacitated warehouse location problem with + different techniques. + - Utilities - model_util.cc A utility to manipulate model files (.cp) dumped by the solver. diff --git a/examples/cpp/costas_array.cc b/examples/cpp/costas_array.cc index 3f6da01144..ff4c99048e 100644 --- a/examples/cpp/costas_array.cc +++ b/examples/cpp/costas_array.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/cryptarithm.cc b/examples/cpp/cryptarithm.cc index d12081ec5d..5270719fac 100644 --- a/examples/cpp/cryptarithm.cc +++ b/examples/cpp/cryptarithm.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/cvrptw.cc b/examples/cpp/cvrptw.cc index ef6fcafa31..c5cd96ddcf 100644 --- a/examples/cpp/cvrptw.cc +++ b/examples/cpp/cvrptw.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/dimacs_assignment.cc b/examples/cpp/dimacs_assignment.cc index 8f9de82f8d..f3e5ba952e 100644 --- a/examples/cpp/dimacs_assignment.cc +++ b/examples/cpp/dimacs_assignment.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/dobble_ls.cc b/examples/cpp/dobble_ls.cc index d4dee3138b..9e9299db44 100644 --- a/examples/cpp/dobble_ls.cc +++ b/examples/cpp/dobble_ls.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/flow_api.cc b/examples/cpp/flow_api.cc index ab1c268bf0..e0b94d3c0c 100644 --- a/examples/cpp/flow_api.cc +++ b/examples/cpp/flow_api.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/golomb.cc b/examples/cpp/golomb.cc index ed738a38f6..b8bbb4ba07 100644 --- a/examples/cpp/golomb.cc +++ b/examples/cpp/golomb.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/integer_programming.cc b/examples/cpp/integer_programming.cc index 3805f96859..f193159c73 100644 --- a/examples/cpp/integer_programming.cc +++ b/examples/cpp/integer_programming.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/jobshop.cc b/examples/cpp/jobshop.cc index 8c32349247..b995221939 100644 --- a/examples/cpp/jobshop.cc +++ b/examples/cpp/jobshop.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/jobshop.h b/examples/cpp/jobshop.h index 4682de165a..c95136f588 100644 --- a/examples/cpp/jobshop.h +++ b/examples/cpp/jobshop.h @@ -1,4 +1,15 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +// Copyright 2010-2012 Google +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // // This model implements a simple jobshop problem. // diff --git a/examples/cpp/jobshop_ls.cc b/examples/cpp/jobshop_ls.cc index be246a5162..cc32b9849c 100644 --- a/examples/cpp/jobshop_ls.cc +++ b/examples/cpp/jobshop_ls.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/linear_assignment_api.cc b/examples/cpp/linear_assignment_api.cc index 9d20f73f54..e405e1a86c 100644 --- a/examples/cpp/linear_assignment_api.cc +++ b/examples/cpp/linear_assignment_api.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/linear_programming.cc b/examples/cpp/linear_programming.cc index 2258e98c9d..3c003214ba 100644 --- a/examples/cpp/linear_programming.cc +++ b/examples/cpp/linear_programming.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/linear_solver_protocol_buffers.cc b/examples/cpp/linear_solver_protocol_buffers.cc index dd4a4eb9f3..49993c4d7f 100644 --- a/examples/cpp/linear_solver_protocol_buffers.cc +++ b/examples/cpp/linear_solver_protocol_buffers.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/magic_square.cc b/examples/cpp/magic_square.cc index 2528f45e4c..c9a3973a42 100644 --- a/examples/cpp/magic_square.cc +++ b/examples/cpp/magic_square.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/model_util.cc b/examples/cpp/model_util.cc index e026982a13..a3311b282a 100644 --- a/examples/cpp/model_util.cc +++ b/examples/cpp/model_util.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/multidim_knapsack.cc b/examples/cpp/multidim_knapsack.cc index fbeec273fb..a3d54d2a65 100644 --- a/examples/cpp/multidim_knapsack.cc +++ b/examples/cpp/multidim_knapsack.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/network_routing.cc b/examples/cpp/network_routing.cc index 2b4d7d7fcb..01d4d84d00 100644 --- a/examples/cpp/network_routing.cc +++ b/examples/cpp/network_routing.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/nqueens.cc b/examples/cpp/nqueens.cc index b34fd11c5a..828ac84787 100644 --- a/examples/cpp/nqueens.cc +++ b/examples/cpp/nqueens.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/parse_dimacs_assignment.cc b/examples/cpp/parse_dimacs_assignment.cc index 183fd937c9..a4834813fd 100644 --- a/examples/cpp/parse_dimacs_assignment.cc +++ b/examples/cpp/parse_dimacs_assignment.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/parse_dimacs_assignment.h b/examples/cpp/parse_dimacs_assignment.h index 0935146eee..f2d64868b1 100644 --- a/examples/cpp/parse_dimacs_assignment.h +++ b/examples/cpp/parse_dimacs_assignment.h @@ -1,4 +1,15 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +// Copyright 2010-2012 Google +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // // Function for reading and parsing a file in DIMACS format: // http://lpsolve.sourceforge.net/5.5/DIMACS_asn.htm diff --git a/examples/cpp/pdptw.cc b/examples/cpp/pdptw.cc index 707cd96062..f98e4df580 100644 --- a/examples/cpp/pdptw.cc +++ b/examples/cpp/pdptw.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/print_dimacs_assignment.cc b/examples/cpp/print_dimacs_assignment.cc index 8ef9c3459f..0fc294f1f2 100644 --- a/examples/cpp/print_dimacs_assignment.cc +++ b/examples/cpp/print_dimacs_assignment.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/print_dimacs_assignment.h b/examples/cpp/print_dimacs_assignment.h index 9e576dd4af..21fd761ea1 100644 --- a/examples/cpp/print_dimacs_assignment.h +++ b/examples/cpp/print_dimacs_assignment.h @@ -1,4 +1,15 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +// Copyright 2010-2012 Google +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // // Function for outputting an assignment problem in DIMACS format: // http://lpsolve.sourceforge.net/5.5/DIMACS_asn.htm diff --git a/examples/cpp/sports_scheduling.cc b/examples/cpp/sports_scheduling.cc index c8aa802fa8..24aa4ebb83 100644 --- a/examples/cpp/sports_scheduling.cc +++ b/examples/cpp/sports_scheduling.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/strawberry_fields_with_column_generation.cc b/examples/cpp/strawberry_fields_with_column_generation.cc index d940405c2d..900574ed90 100644 --- a/examples/cpp/strawberry_fields_with_column_generation.cc +++ b/examples/cpp/strawberry_fields_with_column_generation.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/cpp/tsp.cc b/examples/cpp/tsp.cc index 9e2ff0cfa0..c348627d56 100644 --- a/examples/cpp/tsp.cc +++ b/examples/cpp/tsp.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/examples/python/golomb8.py b/examples/python/golomb8.py index c91bd16aa6..a224e6b4c6 100644 --- a/examples/python/golomb8.py +++ b/examples/python/golomb8.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Google +# Copyright 2010-2012 Google # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/examples/python/hidato_table.py b/examples/python/hidato_table.py index 8eddb8e399..490afaa856 100644 --- a/examples/python/hidato_table.py +++ b/examples/python/hidato_table.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Google +# Copyright 2010-2012 Google # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/examples/python/integer_programming.py b/examples/python/integer_programming.py index 5787fae7a9..6ef6c28fed 100644 --- a/examples/python/integer_programming.py +++ b/examples/python/integer_programming.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Google +# Copyright 2010-2012 Google # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -13,9 +13,6 @@ """Integer programming examples that show how to use the APIs.""" -__author__ = """lperron@google.com (Laurent Perron) - edanna@google.com (Emilie Danna)""" - from google.apputils import app from linear_solver import pywraplp diff --git a/examples/python/jobshop_ft06.py b/examples/python/jobshop_ft06.py index 7ef5c01dbf..39bce768ec 100644 --- a/examples/python/jobshop_ft06.py +++ b/examples/python/jobshop_ft06.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Google +# Copyright 2010-2012 Google # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/examples/python/knapsack.py b/examples/python/knapsack.py index a9ac183df0..02801f9918 100644 --- a/examples/python/knapsack.py +++ b/examples/python/knapsack.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Google +# Copyright 2010-2012 Google # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/examples/python/linear_assignment_api.py b/examples/python/linear_assignment_api.py index 1dcb6926fe..3731da9a67 100644 --- a/examples/python/linear_assignment_api.py +++ b/examples/python/linear_assignment_api.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Google +# Copyright 2010-2012 Google # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/examples/python/linear_programming.py b/examples/python/linear_programming.py index fc2851bbbf..aa5d2908e9 100644 --- a/examples/python/linear_programming.py +++ b/examples/python/linear_programming.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Google +# Copyright 2010-2012 Google # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -13,9 +13,6 @@ """Linear programming examples that show how to use the APIs.""" -__author__ = """lperron@google.com (Laurent Perron) - edanna@google.com (Emilie Danna)""" - from google.apputils import app from linear_solver import pywraplp diff --git a/examples/python/magic_sequence_distribute.py b/examples/python/magic_sequence_distribute.py index bff3004640..2adf077549 100644 --- a/examples/python/magic_sequence_distribute.py +++ b/examples/python/magic_sequence_distribute.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Google +# Copyright 2010-2012 Google # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/examples/python/pyflow_example.py b/examples/python/pyflow_example.py index e0206ccc56..b16cbcce9d 100644 --- a/examples/python/pyflow_example.py +++ b/examples/python/pyflow_example.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Google +# Copyright 2010-2012 Google # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/examples/python/rabbit_pheasant.py b/examples/python/rabbit_pheasant.py index 640d39b83e..b1cd733fee 100644 --- a/examples/python/rabbit_pheasant.py +++ b/examples/python/rabbit_pheasant.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Google +# Copyright 2010-2012 Google # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/examples/python/sendmore.py b/examples/python/sendmore.py index 875d53bf82..454aa0e1f7 100644 --- a/examples/python/sendmore.py +++ b/examples/python/sendmore.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Google +# Copyright 2010-2012 Google # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/examples/python/simple_meeting.py b/examples/python/simple_meeting.py index 7d74bb9fcf..4ca746a6c4 100644 --- a/examples/python/simple_meeting.py +++ b/examples/python/simple_meeting.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Google +# Copyright 2010-2012 Google # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/examples/python/sudoku.py b/examples/python/sudoku.py index fd41a55861..8e527930b0 100644 --- a/examples/python/sudoku.py +++ b/examples/python/sudoku.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Google +# Copyright 2010-2012 Google # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/examples/python/tsp.py b/examples/python/tsp.py index 617eb7d5e7..5b06c56de9 100644 --- a/examples/python/tsp.py +++ b/examples/python/tsp.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Google +# Copyright 2010-2012 Google # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/examples/python/zebra.py b/examples/python/zebra.py index 417aaa3929..db80bd66f3 100644 --- a/examples/python/zebra.py +++ b/examples/python/zebra.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Google +# Copyright 2010-2012 Google # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/src/algorithms/hungarian.cc b/src/algorithms/hungarian.cc index 01b3154651..9c4ed8c9a6 100644 --- a/src/algorithms/hungarian.cc +++ b/src/algorithms/hungarian.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/algorithms/hungarian.h b/src/algorithms/hungarian.h index bc234e545f..c19141977a 100644 --- a/src/algorithms/hungarian.h +++ b/src/algorithms/hungarian.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/algorithms/knapsack_solver.cc b/src/algorithms/knapsack_solver.cc index 9cd2a90d9e..17bc6b104e 100644 --- a/src/algorithms/knapsack_solver.cc +++ b/src/algorithms/knapsack_solver.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/algorithms/knapsack_solver.h b/src/algorithms/knapsack_solver.h index d3e1b5e80b..8fc7fc9c53 100644 --- a/src/algorithms/knapsack_solver.h +++ b/src/algorithms/knapsack_solver.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/adjustable_priority_queue.h b/src/base/adjustable_priority_queue.h index bf0a55fc46..d970d7c487 100644 --- a/src/base/adjustable_priority_queue.h +++ b/src/base/adjustable_priority_queue.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/base.swig b/src/base/base.swig index 100b01e7df..df0195eb9c 100644 --- a/src/base/base.swig +++ b/src/base/base.swig @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/basictypes.h b/src/base/basictypes.h index 25534821e9..3f86b0a2e7 100644 --- a/src/base/basictypes.h +++ b/src/base/basictypes.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/bitmap.cc b/src/base/bitmap.cc index e7dc2c539a..4a95d8663e 100644 --- a/src/base/bitmap.cc +++ b/src/base/bitmap.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/bitmap.h b/src/base/bitmap.h index f47ddc6694..41d23b2405 100644 --- a/src/base/bitmap.h +++ b/src/base/bitmap.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/callback-types.h b/src/base/callback-types.h index b1c9c32acc..194057aac5 100644 --- a/src/base/callback-types.h +++ b/src/base/callback-types.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/callback.cc b/src/base/callback.cc index 9a6188f3d4..d278326b63 100644 --- a/src/base/callback.cc +++ b/src/base/callback.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/callback.h b/src/base/callback.h index a1c95e06e2..61e096c975 100644 --- a/src/base/callback.h +++ b/src/base/callback.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/casts.h b/src/base/casts.h index 2dcc37d654..166b2560af 100644 --- a/src/base/casts.h +++ b/src/base/casts.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/commandlineflags.h b/src/base/commandlineflags.h index 7eb00d338f..25cae0fd71 100644 --- a/src/base/commandlineflags.h +++ b/src/base/commandlineflags.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/concise_iterator.h b/src/base/concise_iterator.h index cceb82e0bd..8597fa99a8 100644 --- a/src/base/concise_iterator.h +++ b/src/base/concise_iterator.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/file.cc b/src/base/file.cc index 079f0987ec..f8445bed9f 100644 --- a/src/base/file.cc +++ b/src/base/file.cc @@ -1,4 +1,4 @@ -// Copyright 2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/file.h b/src/base/file.h index 24ef019d78..3119ee7932 100644 --- a/src/base/file.h +++ b/src/base/file.h @@ -1,4 +1,4 @@ -// Copyright 2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/filelinereader.cc b/src/base/filelinereader.cc index 93927e0673..0171ce02fc 100644 --- a/src/base/filelinereader.cc +++ b/src/base/filelinereader.cc @@ -1,4 +1,4 @@ -// Copyright 2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/filelinereader.h b/src/base/filelinereader.h index 2732eafbf1..df8e38b592 100644 --- a/src/base/filelinereader.h +++ b/src/base/filelinereader.h @@ -1,4 +1,4 @@ -// Copyright 2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/hash.h b/src/base/hash.h index 6fe84a61fa..9bb81a373a 100644 --- a/src/base/hash.h +++ b/src/base/hash.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/int-type-indexed-vector.h b/src/base/int-type-indexed-vector.h index 035e5abba5..2a7c14dc36 100644 --- a/src/base/int-type-indexed-vector.h +++ b/src/base/int-type-indexed-vector.h @@ -1,4 +1,4 @@ -// Copyright 2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/int-type.h b/src/base/int-type.h index b3c8b17fba..40b13fb710 100644 --- a/src/base/int-type.h +++ b/src/base/int-type.h @@ -1,4 +1,4 @@ -// Copyright 2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/integral_types.h b/src/base/integral_types.h index a3ac0b0174..e7e98615a6 100644 --- a/src/base/integral_types.h +++ b/src/base/integral_types.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/jniutil.h b/src/base/jniutil.h index 40c0e1fc78..7603238dbf 100644 --- a/src/base/jniutil.h +++ b/src/base/jniutil.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/join.cc b/src/base/join.cc index 60670664fd..b161753d00 100644 --- a/src/base/join.cc +++ b/src/base/join.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/join.h b/src/base/join.h index f736c28614..9b29fc8f61 100644 --- a/src/base/join.h +++ b/src/base/join.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/logging.cc b/src/base/logging.cc index 5a31450f53..e31d81eb79 100644 --- a/src/base/logging.cc +++ b/src/base/logging.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/logging.h b/src/base/logging.h index f8ac4b75a2..8f825f8b7b 100644 --- a/src/base/logging.h +++ b/src/base/logging.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/macros.h b/src/base/macros.h index eedf29866b..1f3feef5e4 100644 --- a/src/base/macros.h +++ b/src/base/macros.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/map-util.h b/src/base/map-util.h index cbf31d2b1e..ac9981ef3f 100644 --- a/src/base/map-util.h +++ b/src/base/map-util.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/mathutil.h b/src/base/mathutil.h index 44b89c198a..0e8585edab 100644 --- a/src/base/mathutil.h +++ b/src/base/mathutil.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/random.cc b/src/base/random.cc index 7987782ab5..0203fb11ad 100644 --- a/src/base/random.cc +++ b/src/base/random.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/random.h b/src/base/random.h index cecfec6df0..a8793b4e2c 100644 --- a/src/base/random.h +++ b/src/base/random.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/recordio.cc b/src/base/recordio.cc index 96ba9a3ead..c6c620110d 100644 --- a/src/base/recordio.cc +++ b/src/base/recordio.cc @@ -1,4 +1,4 @@ -// Copyright 2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/recordio.h b/src/base/recordio.h index 0bc4d135f8..6b2fc347c5 100644 --- a/src/base/recordio.h +++ b/src/base/recordio.h @@ -1,4 +1,4 @@ -// Copyright 2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/scoped_ptr.h b/src/base/scoped_ptr.h index 8e1590999c..3053c695f9 100644 --- a/src/base/scoped_ptr.h +++ b/src/base/scoped_ptr.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/sparsetable.h b/src/base/sparsetable.h index 360c231b2b..18468588e4 100644 --- a/src/base/sparsetable.h +++ b/src/base/sparsetable.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/split.cc b/src/base/split.cc index 2d2a20103b..038c2c97cf 100644 --- a/src/base/split.cc +++ b/src/base/split.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/split.h b/src/base/split.h index a76ff78f07..26fc55d1f9 100644 --- a/src/base/split.h +++ b/src/base/split.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/stl_util.h b/src/base/stl_util.h index dc9bd0d40a..d56c0f31af 100644 --- a/src/base/stl_util.h +++ b/src/base/stl_util.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/stringpiece.cc b/src/base/stringpiece.cc index 429385d44a..1a053cb864 100644 --- a/src/base/stringpiece.cc +++ b/src/base/stringpiece.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/stringpiece.h b/src/base/stringpiece.h index a5c84e6e1b..a3fc270651 100644 --- a/src/base/stringpiece.h +++ b/src/base/stringpiece.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/stringprintf.cc b/src/base/stringprintf.cc index cbbc12d477..dcc3d050a6 100644 --- a/src/base/stringprintf.cc +++ b/src/base/stringprintf.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/stringprintf.h b/src/base/stringprintf.h index ff1d68aee2..2498dc7abf 100644 --- a/src/base/stringprintf.h +++ b/src/base/stringprintf.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/strtoint.h b/src/base/strtoint.h index 11651b9537..d6c1ea0d84 100644 --- a/src/base/strtoint.h +++ b/src/base/strtoint.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/strutil.h b/src/base/strutil.h index d25185227e..9c4933d152 100644 --- a/src/base/strutil.h +++ b/src/base/strutil.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/sysinfo.cc b/src/base/sysinfo.cc index a7a4508774..62ceac25b1 100644 --- a/src/base/sysinfo.cc +++ b/src/base/sysinfo.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/sysinfo.h b/src/base/sysinfo.h index 3d3e38130d..cf5de8afe2 100644 --- a/src/base/sysinfo.h +++ b/src/base/sysinfo.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/timer.cc b/src/base/timer.cc index 06cea1863b..3d4175408c 100644 --- a/src/base/timer.cc +++ b/src/base/timer.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/base/timer.h b/src/base/timer.h index b5d1821aed..365f03b656 100644 --- a/src/base/timer.h +++ b/src/base/timer.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/com/google/ortools/constraintsolver/FailException.java b/src/com/google/ortools/constraintsolver/FailException.java index 9a501341fe..d3f934c892 100644 --- a/src/com/google/ortools/constraintsolver/FailException.java +++ b/src/com/google/ortools/constraintsolver/FailException.java @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/com/google/ortools/constraintsolver/JavaDecisionBuilder.java b/src/com/google/ortools/constraintsolver/JavaDecisionBuilder.java index 47d1c452d7..e22aee1807 100644 --- a/src/com/google/ortools/constraintsolver/JavaDecisionBuilder.java +++ b/src/com/google/ortools/constraintsolver/JavaDecisionBuilder.java @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/__init__.py b/src/constraint_solver/__init__.py index 2878f4e1e5..82d7d79d88 100644 --- a/src/constraint_solver/__init__.py +++ b/src/constraint_solver/__init__.py @@ -1,4 +1,3 @@ import os as _os __path__.append(_os.path.join(__path__[0], '../gen/constraint_solver')) __path__.append(_os.path.join(__path__[0], '../../lib')) - diff --git a/src/constraint_solver/alldiff_cst.cc b/src/constraint_solver/alldiff_cst.cc index 10a8c17632..48703e6a7c 100644 --- a/src/constraint_solver/alldiff_cst.cc +++ b/src/constraint_solver/alldiff_cst.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -23,7 +23,6 @@ #include "base/scoped_ptr.h" #include "constraint_solver/constraint_solver.h" #include "constraint_solver/constraint_solveri.h" -#include "util/const_ptr_array.h" #include "util/string_array.h" namespace operations_research { @@ -422,76 +421,6 @@ bool BoundsAllDifferent::PropagateMax() { } return modified; } - -class SortConstraint : public Constraint { - public: - SortConstraint(Solver* const solver, - const std::vector& original_vars, - const std::vector& sorted_vars, - int size) - : Constraint(solver), - ovars_(original_vars), - svars_(sorted_vars), - mins_(NULL), - maxs_(NULL), - size_(size) { - if (size_ > 0) { - mins_.reset(new int64[size_]); - memset(mins_.get(), 0, size_ * sizeof(*mins_.get())); - maxs_.reset(new int64[size_]); - memset(maxs_.get(), 0, size_ * sizeof(*maxs_.get())); - } - } - - virtual ~SortConstraint() {} - - virtual void Post() { - Demon* const demon = - solver()->MakeDelayedConstraintInitialPropagateCallback(this); - for (int i = 0; i < size_; ++i) { - ovars_[i]->WhenRange(demon); - svars_[i]->WhenRange(demon); - } - } - - virtual void InitialPropagate() { - for (int i = 0; i < size_; ++i) { - int64 vmin = 0; - int64 vmax = 0; - ovars_[i]->Range(&vmin, &vmax); - mins_[i] = vmin; - maxs_[i] = vmax; - } - std::sort(mins_.get(), mins_.get() + size_); - std::sort(maxs_.get(), maxs_.get() + size_); - for (int i = 0; i < size_; ++i) { - svars_[i]->SetRange(mins_[i], maxs_[i]); - } - } - - virtual void Accept(ModelVisitor* const visitor) const { - visitor->BeginVisitConstraint(ModelVisitor::kSort, this); - visitor->VisitIntegerVariableArrayArgument(ModelVisitor::kVarsArgument, - ovars_); - visitor->VisitIntegerVariableArrayArgument(ModelVisitor::kTargetArgument, - svars_); - visitor->EndVisitConstraint(ModelVisitor::kSort, this); - } - - virtual string DebugString() const { - return StringPrintf("Sort(%s, %s)", - ovars_.DebugString().c_str(), - svars_.DebugString().c_str()); - } - - private: - ConstPtrArray ovars_; - ConstPtrArray svars_; - scoped_array mins_; - scoped_array maxs_; - const int size_; -}; - } // namespace Constraint* Solver::MakeAllDifferent(const std::vector& vars) { diff --git a/src/constraint_solver/assignment.cc b/src/constraint_solver/assignment.cc index 51ccca977b..489d76cbc7 100644 --- a/src/constraint_solver/assignment.cc +++ b/src/constraint_solver/assignment.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/assignment.proto b/src/constraint_solver/assignment.proto index 10753f967d..3fd74ad53f 100644 --- a/src/constraint_solver/assignment.proto +++ b/src/constraint_solver/assignment.proto @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/collect_variables.cc b/src/constraint_solver/collect_variables.cc index 1ebff6c0af..65be1ef394 100644 --- a/src/constraint_solver/collect_variables.cc +++ b/src/constraint_solver/collect_variables.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/constraint_solver.cc b/src/constraint_solver/constraint_solver.cc index 29eee2a298..ed3960eca3 100644 --- a/src/constraint_solver/constraint_solver.cc +++ b/src/constraint_solver/constraint_solver.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -2632,7 +2632,6 @@ const char ModelVisitor::kScalProdGreaterOrEqual[] = const char ModelVisitor::kScalProdLessOrEqual[] = "ScalarProductLessOrEqual"; const char ModelVisitor::kSemiContinuous[] = "SemiContinuous"; const char ModelVisitor::kSequenceVariable[] = "SequenceVariable"; -const char ModelVisitor::kSort[] = "Sort"; const char ModelVisitor::kSquare[] = "Square"; const char ModelVisitor::kStartExpr[]= "StartExpression"; const char ModelVisitor::kSum[] = "Sum"; diff --git a/src/constraint_solver/constraint_solver.h b/src/constraint_solver/constraint_solver.h index 83f567d04d..100619063d 100644 --- a/src/constraint_solver/constraint_solver.h +++ b/src/constraint_solver/constraint_solver.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -3254,7 +3254,6 @@ class ModelVisitor : public BaseObject { static const char kScalProdLessOrEqual[]; static const char kSemiContinuous[]; static const char kSequenceVariable[]; - static const char kSort[]; static const char kSquare[]; static const char kStartExpr[]; static const char kSum[]; diff --git a/src/constraint_solver/constraint_solver.swig b/src/constraint_solver/constraint_solver.swig index bef5566fdc..22e3e8c17f 100644 --- a/src/constraint_solver/constraint_solver.swig +++ b/src/constraint_solver/constraint_solver.swig @@ -279,7 +279,6 @@ class PyDecisionBuilder(object): %rename (Stamp) operations_research::Solver::stamp; %rename (WallTime) operations_research::Solver::wall_time; -// Automatic rule. %rename("%(strip:[Make])s", %$isfunction) ""; namespace operations_research { diff --git a/src/constraint_solver/constraint_solveri.h b/src/constraint_solver/constraint_solveri.h index 1fd73c515e..0fc20cb005 100644 --- a/src/constraint_solver/constraint_solveri.h +++ b/src/constraint_solver/constraint_solveri.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/constraints.cc b/src/constraint_solver/constraints.cc index afdecc37a0..a2ef34c25a 100644 --- a/src/constraint_solver/constraints.cc +++ b/src/constraint_solver/constraints.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/count_cst.cc b/src/constraint_solver/count_cst.cc index 6c02e334c9..c8e3d67c64 100644 --- a/src/constraint_solver/count_cst.cc +++ b/src/constraint_solver/count_cst.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/default_search.cc b/src/constraint_solver/default_search.cc index a678f70086..3e0b4fae32 100644 --- a/src/constraint_solver/default_search.cc +++ b/src/constraint_solver/default_search.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/demon_profiler.cc b/src/constraint_solver/demon_profiler.cc index 6bb4ea9ab3..039bf77471 100644 --- a/src/constraint_solver/demon_profiler.cc +++ b/src/constraint_solver/demon_profiler.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/demon_profiler.proto b/src/constraint_solver/demon_profiler.proto index 1420c9114c..b93153b22d 100644 --- a/src/constraint_solver/demon_profiler.proto +++ b/src/constraint_solver/demon_profiler.proto @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/dependency_graph.cc b/src/constraint_solver/dependency_graph.cc index cf55f734b6..205051c68a 100644 --- a/src/constraint_solver/dependency_graph.cc +++ b/src/constraint_solver/dependency_graph.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/deviation.cc b/src/constraint_solver/deviation.cc index c3e71b0e78..7892bb1f66 100644 --- a/src/constraint_solver/deviation.cc +++ b/src/constraint_solver/deviation.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/element.cc b/src/constraint_solver/element.cc index d0a64afe15..3212b25bae 100644 --- a/src/constraint_solver/element.cc +++ b/src/constraint_solver/element.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/expr_array.cc b/src/constraint_solver/expr_array.cc index afe0db4b83..e96907e021 100644 --- a/src/constraint_solver/expr_array.cc +++ b/src/constraint_solver/expr_array.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/expr_cst.cc b/src/constraint_solver/expr_cst.cc index 1001770fbc..fc855c7718 100644 --- a/src/constraint_solver/expr_cst.cc +++ b/src/constraint_solver/expr_cst.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/expressions.cc b/src/constraint_solver/expressions.cc index 7a54dde687..e1fb8570de 100644 --- a/src/constraint_solver/expressions.cc +++ b/src/constraint_solver/expressions.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/hybrid.cc b/src/constraint_solver/hybrid.cc index 028e6d5129..e1644b87ea 100644 --- a/src/constraint_solver/hybrid.cc +++ b/src/constraint_solver/hybrid.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/interval.cc b/src/constraint_solver/interval.cc index e1dc21ec78..8288a8c9f0 100644 --- a/src/constraint_solver/interval.cc +++ b/src/constraint_solver/interval.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/io.cc b/src/constraint_solver/io.cc index 3a4df10e8b..63e5b21615 100644 --- a/src/constraint_solver/io.cc +++ b/src/constraint_solver/io.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/local_search.cc b/src/constraint_solver/local_search.cc index ac32de9e9b..948be02a88 100644 --- a/src/constraint_solver/local_search.cc +++ b/src/constraint_solver/local_search.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/model.proto b/src/constraint_solver/model.proto index d69571626e..9656cafe77 100644 --- a/src/constraint_solver/model.proto +++ b/src/constraint_solver/model.proto @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/model_cache.cc b/src/constraint_solver/model_cache.cc index bf86a8e776..10c2d16f0d 100644 --- a/src/constraint_solver/model_cache.cc +++ b/src/constraint_solver/model_cache.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/nogoods.cc b/src/constraint_solver/nogoods.cc index 026839da9d..3bdea310f3 100644 --- a/src/constraint_solver/nogoods.cc +++ b/src/constraint_solver/nogoods.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/pack.cc b/src/constraint_solver/pack.cc index caef682a24..6acfc2c277 100644 --- a/src/constraint_solver/pack.cc +++ b/src/constraint_solver/pack.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/range_cst.cc b/src/constraint_solver/range_cst.cc index b885548bff..39039e8f20 100644 --- a/src/constraint_solver/range_cst.cc +++ b/src/constraint_solver/range_cst.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/resource.cc b/src/constraint_solver/resource.cc index 1ab8628539..a77edb000d 100644 --- a/src/constraint_solver/resource.cc +++ b/src/constraint_solver/resource.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/routing.cc b/src/constraint_solver/routing.cc index 9f32e247a8..6e3b03a3b5 100644 --- a/src/constraint_solver/routing.cc +++ b/src/constraint_solver/routing.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -332,8 +332,12 @@ LocalSearchOperator* MakePairRelocate(Solver* const solver, class RoutingCache { public: - RoutingCache(RoutingModel::NodeEvaluator2* callback, int size) : - cache_(size), callback_(callback) { + RoutingCache(RoutingModel::NodeEvaluator2* callback, int size) + : cached_(size), cache_(size), callback_(callback) { + for (RoutingModel::NodeIndex i(0); i < RoutingModel::NodeIndex(size); ++i) { + cached_[i].resize(size, false); + cache_[i].resize(size, 0); + } callback->CheckIsRepeatable(); } int64 Run(RoutingModel::NodeIndex i, RoutingModel::NodeIndex j) { @@ -341,16 +345,22 @@ class RoutingCache { // checks if it has been run with these parameters before, and // returns previous result if so, or runs underlaying callback and // stores its result. - int64 cached_value = 0; - if (!FindCopy(cache_[i], j, &cached_value)) { - cached_value = callback_->Run(i, j); + // Not MT-safe. + if (cached_[i][j]) { + return cache_[i][j]; + } else { + const int64 cached_value = callback_->Run(i, j); + cached_[i][j] = true; cache_[i][j] = cached_value; + return cached_value; } - return cached_value; } + private: ITIVector > cache_; + ITIVector > cached_; + ITIVector > cache_; scoped_ptr callback_; }; @@ -2480,7 +2490,7 @@ void RoutingModel::AddToAssignment(IntVar* const var) { RoutingModel::NodeEvaluator2* RoutingModel::NewCachedCallback( NodeEvaluator2* callback) { - const int size = Size() + vehicles_; + const int size = node_to_index_.size(); if (FLAGS_routing_cache_callbacks && size <= FLAGS_routing_max_cache_size) { routing_caches_.push_back(new RoutingCache(callback, size)); NodeEvaluator2* const cached_evaluator = diff --git a/src/constraint_solver/routing.h b/src/constraint_solver/routing.h index ae11b3e42b..20f9a4bbe4 100644 --- a/src/constraint_solver/routing.h +++ b/src/constraint_solver/routing.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/routing.swig b/src/constraint_solver/routing.swig index d6f3f60ede..e754eb0e8e 100644 --- a/src/constraint_solver/routing.swig +++ b/src/constraint_solver/routing.swig @@ -240,7 +240,6 @@ class NodeEvaluator2 { %typemap(cstype) operations_research::RoutingModel::NodeEvaluator2* "NodeEvaluator2"; %typemap(csin) operations_research::RoutingModel::NodeEvaluator2* "SWIGTYPE_p_ResultCallback2T_long_long__RoutingModel_NodeIndex__RoutingModel_NodeIndex_t.getCPtr($csinput.GetPermanentCallback())"; #endif // SWIGCSHARP - %ignore RoutingModel::AddVectorDimension(const int64* values, int64 capacity, const string& name); diff --git a/src/constraint_solver/sched_search.cc b/src/constraint_solver/sched_search.cc index 6a3b09bdc2..65b7c838e3 100644 --- a/src/constraint_solver/sched_search.cc +++ b/src/constraint_solver/sched_search.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/search.cc b/src/constraint_solver/search.cc index f543bad5e8..9282f6184b 100644 --- a/src/constraint_solver/search.cc +++ b/src/constraint_solver/search.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/search_limit.proto b/src/constraint_solver/search_limit.proto index 29be48124b..a9e5bebc8f 100644 --- a/src/constraint_solver/search_limit.proto +++ b/src/constraint_solver/search_limit.proto @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/table.cc b/src/constraint_solver/table.cc index 68bb96fefa..01edd8a957 100644 --- a/src/constraint_solver/table.cc +++ b/src/constraint_solver/table.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/timetabling.cc b/src/constraint_solver/timetabling.cc index 1dba4b2520..bde665aa72 100644 --- a/src/constraint_solver/timetabling.cc +++ b/src/constraint_solver/timetabling.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/trace.cc b/src/constraint_solver/trace.cc index f15234c6f3..20f2f627fe 100644 --- a/src/constraint_solver/trace.cc +++ b/src/constraint_solver/trace.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/tree_monitor.cc b/src/constraint_solver/tree_monitor.cc index d4e136a2e1..51cf454510 100644 --- a/src/constraint_solver/tree_monitor.cc +++ b/src/constraint_solver/tree_monitor.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/utilities.cc b/src/constraint_solver/utilities.cc index 1625e3831a..1ba235ead5 100644 --- a/src/constraint_solver/utilities.cc +++ b/src/constraint_solver/utilities.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/constraint_solver/visitor.cc b/src/constraint_solver/visitor.cc index 471a98f6c6..66edbe7424 100644 --- a/src/constraint_solver/visitor.cc +++ b/src/constraint_solver/visitor.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/graph/bellman_ford.cc b/src/graph/bellman_ford.cc index 74c0fb1b88..e7f07da7a6 100644 --- a/src/graph/bellman_ford.cc +++ b/src/graph/bellman_ford.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/graph/cliques.cc b/src/graph/cliques.cc index 6eaa171865..16f9e3ac23 100644 --- a/src/graph/cliques.cc +++ b/src/graph/cliques.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/graph/cliques.h b/src/graph/cliques.h index 7d12f38e2e..ef95b40d7b 100644 --- a/src/graph/cliques.h +++ b/src/graph/cliques.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/graph/connectivity.cc b/src/graph/connectivity.cc index a91c0110cf..e66b0ecc68 100644 --- a/src/graph/connectivity.cc +++ b/src/graph/connectivity.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/graph/connectivity.h b/src/graph/connectivity.h index 315850d205..967a13cb16 100644 --- a/src/graph/connectivity.h +++ b/src/graph/connectivity.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/graph/dijkstra.cc b/src/graph/dijkstra.cc index 37756e32a6..0fd4dc0da2 100644 --- a/src/graph/dijkstra.cc +++ b/src/graph/dijkstra.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/graph/ebert_graph.h b/src/graph/ebert_graph.h index 7dbfd6330c..00a0649d16 100644 --- a/src/graph/ebert_graph.h +++ b/src/graph/ebert_graph.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/graph/hamiltonian_path.h b/src/graph/hamiltonian_path.h index 2107bffe3f..90b212fec5 100644 --- a/src/graph/hamiltonian_path.h +++ b/src/graph/hamiltonian_path.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/graph/linear_assignment.cc b/src/graph/linear_assignment.cc index ba3f544e70..1e485cf4e9 100644 --- a/src/graph/linear_assignment.cc +++ b/src/graph/linear_assignment.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/graph/linear_assignment.h b/src/graph/linear_assignment.h index 90e51ca865..afd2cef3e3 100644 --- a/src/graph/linear_assignment.h +++ b/src/graph/linear_assignment.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/graph/max_flow.cc b/src/graph/max_flow.cc index cb77ddfb68..73ae430b34 100644 --- a/src/graph/max_flow.cc +++ b/src/graph/max_flow.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/graph/max_flow.h b/src/graph/max_flow.h index 55ed5abd72..3d95bd8988 100644 --- a/src/graph/max_flow.h +++ b/src/graph/max_flow.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/graph/min_cost_flow.cc b/src/graph/min_cost_flow.cc index 02fdf1c2f4..5a6f41d716 100644 --- a/src/graph/min_cost_flow.cc +++ b/src/graph/min_cost_flow.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/graph/min_cost_flow.h b/src/graph/min_cost_flow.h index d8dc1f7141..0c30994f5a 100644 --- a/src/graph/min_cost_flow.h +++ b/src/graph/min_cost_flow.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/graph/shortestpaths.cc b/src/graph/shortestpaths.cc index b47e378795..a126bd28ad 100644 --- a/src/graph/shortestpaths.cc +++ b/src/graph/shortestpaths.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/graph/shortestpaths.h b/src/graph/shortestpaths.h index 29583d3de8..4b3eedd761 100644 --- a/src/graph/shortestpaths.h +++ b/src/graph/shortestpaths.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/linear_solver/cbc_interface.cc b/src/linear_solver/cbc_interface.cc index 55f3d68332..a9b9ff13a4 100644 --- a/src/linear_solver/cbc_interface.cc +++ b/src/linear_solver/cbc_interface.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/linear_solver/clp_interface.cc b/src/linear_solver/clp_interface.cc index 541b760d38..fc11bf3482 100644 --- a/src/linear_solver/clp_interface.cc +++ b/src/linear_solver/clp_interface.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/linear_solver/glpk_interface.cc b/src/linear_solver/glpk_interface.cc index 4ceb46e4f7..57c3b428ca 100644 --- a/src/linear_solver/glpk_interface.cc +++ b/src/linear_solver/glpk_interface.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/linear_solver/linear_solver.cc b/src/linear_solver/linear_solver.cc index 1693e8087e..c8853a6fd3 100644 --- a/src/linear_solver/linear_solver.cc +++ b/src/linear_solver/linear_solver.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/linear_solver/linear_solver.h b/src/linear_solver/linear_solver.h index 7c27a32f73..602bacd53b 100644 --- a/src/linear_solver/linear_solver.h +++ b/src/linear_solver/linear_solver.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/linear_solver/linear_solver.proto b/src/linear_solver/linear_solver.proto index accaff0815..3dcced21e3 100644 --- a/src/linear_solver/linear_solver.proto +++ b/src/linear_solver/linear_solver.proto @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/linear_solver/scip_interface.cc b/src/linear_solver/scip_interface.cc index a5f287ac15..0ae66a5384 100644 --- a/src/linear_solver/scip_interface.cc +++ b/src/linear_solver/scip_interface.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/bitset.cc b/src/util/bitset.cc index 962df37c5e..491814df3c 100644 --- a/src/util/bitset.cc +++ b/src/util/bitset.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/bitset.h b/src/util/bitset.h index aa70b8b743..410589868a 100644 --- a/src/util/bitset.h +++ b/src/util/bitset.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/cached_log.cc b/src/util/cached_log.cc index 6b0f5072eb..750e1a8adf 100644 --- a/src/util/cached_log.cc +++ b/src/util/cached_log.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/cached_log.h b/src/util/cached_log.h index ab292ec5d7..f84e00313c 100644 --- a/src/util/cached_log.h +++ b/src/util/cached_log.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/const_int_array.cc b/src/util/const_int_array.cc index d0baf29c6e..903c3a9703 100644 --- a/src/util/const_int_array.cc +++ b/src/util/const_int_array.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/const_int_array.h b/src/util/const_int_array.h index cc45fb4397..32c93f96d3 100644 --- a/src/util/const_int_array.h +++ b/src/util/const_int_array.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/const_int_ptr_array.h b/src/util/const_int_ptr_array.h index 776d2df42b..f5f5fed405 100644 --- a/src/util/const_int_ptr_array.h +++ b/src/util/const_int_ptr_array.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/const_ptr_array.h b/src/util/const_ptr_array.h index 2200301769..d36ac04deb 100644 --- a/src/util/const_ptr_array.h +++ b/src/util/const_ptr_array.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/graph_export.cc b/src/util/graph_export.cc index 3bb344983d..f07a1e5576 100644 --- a/src/util/graph_export.cc +++ b/src/util/graph_export.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/graph_export.h b/src/util/graph_export.h index aa29fafe85..2de361a188 100644 --- a/src/util/graph_export.h +++ b/src/util/graph_export.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/monoid_operation_tree.h b/src/util/monoid_operation_tree.h index 376d2b054b..da1aec0c19 100644 --- a/src/util/monoid_operation_tree.h +++ b/src/util/monoid_operation_tree.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/permutation.h b/src/util/permutation.h index 2eb572b123..36082e4afd 100644 --- a/src/util/permutation.h +++ b/src/util/permutation.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/string_array.h b/src/util/string_array.h index 0ce0afbe2b..1fce71b761 100644 --- a/src/util/string_array.h +++ b/src/util/string_array.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/vector_map.h b/src/util/vector_map.h index e710845ac5..ba6fff06ed 100644 --- a/src/util/vector_map.h +++ b/src/util/vector_map.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/xml_helper.cc b/src/util/xml_helper.cc index 3c8457d4ac..8d149c8d5e 100644 --- a/src/util/xml_helper.cc +++ b/src/util/xml_helper.cc @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/xml_helper.h b/src/util/xml_helper.h index f599142424..dfd078c83d 100644 --- a/src/util/xml_helper.h +++ b/src/util/xml_helper.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/util/zvector.h b/src/util/zvector.h index ebeb0bc638..37b4cd1d81 100644 --- a/src/util/zvector.h +++ b/src/util/zvector.h @@ -1,4 +1,4 @@ -// Copyright 2010-2011 Google +// Copyright 2010-2012 Google // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at