diff --git a/algorithms/hungarian.cc b/algorithms/hungarian.cc index 7598fc6505..bfb7888ff1 100644 --- a/algorithms/hungarian.cc +++ b/algorithms/hungarian.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/algorithms/hungarian.h b/algorithms/hungarian.h index 88056fcae1..1c1c8b4af0 100644 --- a/algorithms/hungarian.h +++ b/algorithms/hungarian.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/algorithms/knapsack_solver.cc b/algorithms/knapsack_solver.cc index f307da3f48..feacb1efd2 100644 --- a/algorithms/knapsack_solver.cc +++ b/algorithms/knapsack_solver.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/algorithms/knapsack_solver.h b/algorithms/knapsack_solver.h index 316bad177e..d926b12786 100644 --- a/algorithms/knapsack_solver.h +++ b/algorithms/knapsack_solver.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/algorithms/knapsack_solver.swig b/algorithms/knapsack_solver.swig index c45d591669..215acade18 100644 --- a/algorithms/knapsack_solver.swig +++ b/algorithms/knapsack_solver.swig @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/com/google/ortools/constraintsolver/FailException.java b/com/google/ortools/constraintsolver/FailException.java index 6d4c06df7e..9a501341fe 100644 --- a/com/google/ortools/constraintsolver/FailException.java +++ b/com/google/ortools/constraintsolver/FailException.java @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/com/google/ortools/constraintsolver/JavaDecisionBuilder.java b/com/google/ortools/constraintsolver/JavaDecisionBuilder.java index ac4136a24d..47d1c452d7 100644 --- a/com/google/ortools/constraintsolver/JavaDecisionBuilder.java +++ b/com/google/ortools/constraintsolver/JavaDecisionBuilder.java @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/com/google/ortools/constraintsolver/samples/RabbitsPheasants.java b/com/google/ortools/constraintsolver/samples/RabbitsPheasants.java index 47cc2e4d95..a68976ac21 100644 --- a/com/google/ortools/constraintsolver/samples/RabbitsPheasants.java +++ b/com/google/ortools/constraintsolver/samples/RabbitsPheasants.java @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/com/google/ortools/flow/samples/FlowExample.java b/com/google/ortools/flow/samples/FlowExample.java index 7e202985e2..6e4896759c 100644 --- a/com/google/ortools/flow/samples/FlowExample.java +++ b/com/google/ortools/flow/samples/FlowExample.java @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/com/google/ortools/knapsacksolver/samples/Knapsack.java b/com/google/ortools/knapsacksolver/samples/Knapsack.java index de8679be20..ad025a33b7 100644 --- a/com/google/ortools/knapsacksolver/samples/Knapsack.java +++ b/com/google/ortools/knapsacksolver/samples/Knapsack.java @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/com/google/ortools/linearsolver/samples/IntegerSolverExample.java b/com/google/ortools/linearsolver/samples/IntegerSolverExample.java index 59b4c351e3..a15993914f 100644 --- a/com/google/ortools/linearsolver/samples/IntegerSolverExample.java +++ b/com/google/ortools/linearsolver/samples/IntegerSolverExample.java @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/com/google/ortools/linearsolver/samples/LinearSolverExample.java b/com/google/ortools/linearsolver/samples/LinearSolverExample.java index 0248fcfd09..28e7f52e66 100644 --- a/com/google/ortools/linearsolver/samples/LinearSolverExample.java +++ b/com/google/ortools/linearsolver/samples/LinearSolverExample.java @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/alldiff_cst.cc b/constraint_solver/alldiff_cst.cc index 00678259ce..6c97827fd0 100644 --- a/constraint_solver/alldiff_cst.cc +++ b/constraint_solver/alldiff_cst.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/assignment.cc b/constraint_solver/assignment.cc index 330e9169a2..02b10db2b0 100644 --- a/constraint_solver/assignment.cc +++ b/constraint_solver/assignment.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/assignment.proto b/constraint_solver/assignment.proto index 56c304e4c2..5bf028603b 100644 --- a/constraint_solver/assignment.proto +++ b/constraint_solver/assignment.proto @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/constraint_solver.cc b/constraint_solver/constraint_solver.cc index f5f1dde56a..0f42c13f07 100644 --- a/constraint_solver/constraint_solver.cc +++ b/constraint_solver/constraint_solver.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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 @@ -1020,9 +1020,9 @@ void Search::Clear() { } void Search::EnterSearch() { - // We clean the solution counter when entering the search instead of - // when clearing it to have the information persist outside of the - // top level search. + // The solution counter is reset when entering search and not when + // leaving search. This enables the information to persist outside of + // top-level search. solution_counter_ = 0; for (vector::iterator it = monitors_.begin(); diff --git a/constraint_solver/constraint_solver.h b/constraint_solver/constraint_solver.h index 59011c9af4..2b783e1e14 100644 --- a/constraint_solver/constraint_solver.h +++ b/constraint_solver/constraint_solver.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/constraint_solver.swig b/constraint_solver/constraint_solver.swig index 135f46ef6e..9db1031d39 100644 --- a/constraint_solver/constraint_solver.swig +++ b/constraint_solver/constraint_solver.swig @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/constraint_solveri.h b/constraint_solver/constraint_solveri.h index 3ba21bed05..9ef64d114c 100644 --- a/constraint_solver/constraint_solveri.h +++ b/constraint_solver/constraint_solveri.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/constraints.cc b/constraint_solver/constraints.cc index ce4cb71c9f..7f9c82693b 100644 --- a/constraint_solver/constraints.cc +++ b/constraint_solver/constraints.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/count_cst.cc b/constraint_solver/count_cst.cc index 8a8ce9b4cd..d137ace461 100644 --- a/constraint_solver/count_cst.cc +++ b/constraint_solver/count_cst.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/default_search.cc b/constraint_solver/default_search.cc index bdca6d9e24..8523a304fa 100644 --- a/constraint_solver/default_search.cc +++ b/constraint_solver/default_search.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/demon_profiler.cc b/constraint_solver/demon_profiler.cc index d801855bae..ee23d045ae 100644 --- a/constraint_solver/demon_profiler.cc +++ b/constraint_solver/demon_profiler.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/demon_profiler.proto b/constraint_solver/demon_profiler.proto index 36dbf40df6..8fe3ae3fc7 100644 --- a/constraint_solver/demon_profiler.proto +++ b/constraint_solver/demon_profiler.proto @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/element.cc b/constraint_solver/element.cc index ba42cced74..7dca80cc93 100644 --- a/constraint_solver/element.cc +++ b/constraint_solver/element.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/expr_array.cc b/constraint_solver/expr_array.cc index 23b3e7f741..66cf143bca 100644 --- a/constraint_solver/expr_array.cc +++ b/constraint_solver/expr_array.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/expr_cst.cc b/constraint_solver/expr_cst.cc index 1d21f3a6e4..7f96ca5777 100644 --- a/constraint_solver/expr_cst.cc +++ b/constraint_solver/expr_cst.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/expressions.cc b/constraint_solver/expressions.cc index b61c106926..58efbdbe58 100644 --- a/constraint_solver/expressions.cc +++ b/constraint_solver/expressions.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/interval.cc b/constraint_solver/interval.cc index 8d6050d528..a91c685fad 100644 --- a/constraint_solver/interval.cc +++ b/constraint_solver/interval.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/local_search.cc b/constraint_solver/local_search.cc index c4c5e5488f..c330a0ada5 100644 --- a/constraint_solver/local_search.cc +++ b/constraint_solver/local_search.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/pack.cc b/constraint_solver/pack.cc index 5a85a9cd01..2581c56f01 100644 --- a/constraint_solver/pack.cc +++ b/constraint_solver/pack.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/range_cst.cc b/constraint_solver/range_cst.cc index 7a30b1e466..2fbc531a97 100644 --- a/constraint_solver/range_cst.cc +++ b/constraint_solver/range_cst.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/resource.cc b/constraint_solver/resource.cc index b3a362a69e..28c1c05f73 100644 --- a/constraint_solver/resource.cc +++ b/constraint_solver/resource.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/routing.cc b/constraint_solver/routing.cc index 1a4b6f599d..c1b61f60b8 100644 --- a/constraint_solver/routing.cc +++ b/constraint_solver/routing.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/routing.h b/constraint_solver/routing.h index 6d35fe052e..ced6b07715 100644 --- a/constraint_solver/routing.h +++ b/constraint_solver/routing.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/routing.swig b/constraint_solver/routing.swig index ecc35375cd..8eb4ad97b6 100644 --- a/constraint_solver/routing.swig +++ b/constraint_solver/routing.swig @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/sched_search.cc b/constraint_solver/sched_search.cc index 62d0902617..50d4bd3f89 100644 --- a/constraint_solver/sched_search.cc +++ b/constraint_solver/sched_search.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/search.cc b/constraint_solver/search.cc index dc944fd351..85211be988 100644 --- a/constraint_solver/search.cc +++ b/constraint_solver/search.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/search_limit.proto b/constraint_solver/search_limit.proto index 20a5e4a017..29be48124b 100644 --- a/constraint_solver/search_limit.proto +++ b/constraint_solver/search_limit.proto @@ -1,4 +1,15 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +// Copyright 2010-2011 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 file contains a protocol buffer definition for search limits. diff --git a/constraint_solver/table.cc b/constraint_solver/table.cc index 25f78dbe17..2c1cafbd42 100644 --- a/constraint_solver/table.cc +++ b/constraint_solver/table.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/timetabling.cc b/constraint_solver/timetabling.cc index 068f66e51c..8b136a99da 100644 --- a/constraint_solver/timetabling.cc +++ b/constraint_solver/timetabling.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/tree_monitor.cc b/constraint_solver/tree_monitor.cc index 6c34a2a976..f95d893d84 100644 --- a/constraint_solver/tree_monitor.cc +++ b/constraint_solver/tree_monitor.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/constraint_solver/utilities.cc b/constraint_solver/utilities.cc index 9e4af7a97d..9afbddeb11 100644 --- a/constraint_solver/utilities.cc +++ b/constraint_solver/utilities.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/costas_array.cc b/examples/costas_array.cc index bf0171c5d8..b786688050 100644 --- a/examples/costas_array.cc +++ b/examples/costas_array.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/cryptarithm.cc b/examples/cryptarithm.cc index eb03c58c42..b6c58ddff3 100644 --- a/examples/cryptarithm.cc +++ b/examples/cryptarithm.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/cvrptw.cc b/examples/cvrptw.cc index cd55ac66d5..a2ad9fe7e5 100644 --- a/examples/cvrptw.cc +++ b/examples/cvrptw.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/flow_example.cc b/examples/flow_example.cc index 4fce5fe649..c92099a8d4 100644 --- a/examples/flow_example.cc +++ b/examples/flow_example.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/golomb.cc b/examples/golomb.cc index f369feebf4..d8d4e788ff 100644 --- a/examples/golomb.cc +++ b/examples/golomb.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/integer_solver_example.cc b/examples/integer_solver_example.cc index 553a3f39cb..83a85dcb1d 100644 --- a/examples/integer_solver_example.cc +++ b/examples/integer_solver_example.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/linear_solver_example.cc b/examples/linear_solver_example.cc index 178f80b10c..9d02c81bc2 100644 --- a/examples/linear_solver_example.cc +++ b/examples/linear_solver_example.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/magic_square.cc b/examples/magic_square.cc index ffbfeba685..3d6eafafde 100644 --- a/examples/magic_square.cc +++ b/examples/magic_square.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/network_routing.cc b/examples/network_routing.cc index a1cc5c6d4a..dde2fdc7e3 100644 --- a/examples/network_routing.cc +++ b/examples/network_routing.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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 @@ -44,23 +44,23 @@ #include "base/random.h" // ----- Data Generator ----- -DEFINE_int32(clients, 10, "Number of network clients nodes. If equal to zero, " +DEFINE_int32(clients, 0, "Number of network clients nodes. If equal to zero, " "then all backbones nodes are also client nodes."); -DEFINE_int32(backbones, 10, "Number of backbone nodes"); -DEFINE_int32(demands, 30, "Number of network demands."); -DEFINE_int32(traffic_min, 5, "Min traffic of a demand."); -DEFINE_int32(traffic_max, 20, "Max traffic of a demand."); -DEFINE_int32(min_client_degree, 2, +DEFINE_int32(backbones, 0, "Number of backbone nodes"); +DEFINE_int32(demands, 0, "Number of network demands."); +DEFINE_int32(traffic_min, 0, "Min traffic of a demand."); +DEFINE_int32(traffic_max, 0, "Max traffic of a demand."); +DEFINE_int32(min_client_degree, 0, "Min number of connections from a client to the backbone."); -DEFINE_int32(max_client_degree, 2, +DEFINE_int32(max_client_degree, 0, "Max number of connections from a client to the backbone."); -DEFINE_int32(min_backbone_degree, 2, +DEFINE_int32(min_backbone_degree, 0, "Min number of connections from a backbone node to the rest of " "the backbone nodes."); -DEFINE_int32(max_backbone_degree, 5, +DEFINE_int32(max_backbone_degree, 0, "Max number of connections from a backbone node to the rest of " "the backbone nodes."); -DEFINE_int32(max_capacity, 60, "Max traffic on any arc."); +DEFINE_int32(max_capacity, 0, "Max traffic on any arc."); DEFINE_int32(fixed_charge_cost, 0, "Fixed charged cost when using an arc."); DEFINE_int32(seed, 0, "Random seed"); @@ -90,8 +90,6 @@ DEFINE_bool(focus_lns, true, "Focus LNS on highest cost arcs."); namespace operations_research { // ---------- Data and Data Generation ---------- - - namespace { #if defined(_MSC_VER) // The following class defines a hash function for arcs @@ -106,7 +104,7 @@ namespace { } bool operator() (const pair& a1, const pair& a2) const { return a1.first < a2.first || - (a1.first == a2.first && a1.second < a2.second); + (a1.first == a2.first && a1.second < a2.second); } }; #endif @@ -380,7 +378,6 @@ class NetworkRoutingDataBuilder { } data->set_max_capacity(max_capacity); data->set_fixed_charge_cost(fixed_charge_cost); - } void AddEdge(int i, int j) { diff --git a/examples/nqueens.cc b/examples/nqueens.cc index 2e5d960407..ccfe202b31 100644 --- a/examples/nqueens.cc +++ b/examples/nqueens.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/tsp.cc b/examples/tsp.cc index 2789910d7f..0b71eeefa8 100644 --- a/examples/tsp.cc +++ b/examples/tsp.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/graph/bellman_ford.cc b/graph/bellman_ford.cc index 0575b2b559..a3fe091e3c 100644 --- a/graph/bellman_ford.cc +++ b/graph/bellman_ford.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/graph/bron_kerbosch.cc b/graph/bron_kerbosch.cc index 732678f9b7..754c9282fd 100644 --- a/graph/bron_kerbosch.cc +++ b/graph/bron_kerbosch.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/graph/connectivity.h b/graph/connectivity.h index 4f08e6b3ca..1b215a472b 100644 --- a/graph/connectivity.h +++ b/graph/connectivity.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/graph/dijkstra.cc b/graph/dijkstra.cc index c7ccc99b1b..0d8b443141 100644 --- a/graph/dijkstra.cc +++ b/graph/dijkstra.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/graph/ebert_graph.h b/graph/ebert_graph.h index 2f64293918..1acb6acb18 100644 --- a/graph/ebert_graph.h +++ b/graph/ebert_graph.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/graph/flow.swig b/graph/flow.swig index 5539f25ea7..fa3c26f5e7 100644 --- a/graph/flow.swig +++ b/graph/flow.swig @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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,7 +13,7 @@ %include util/data.swig -// Include the file we want to wrap a first time. +// First phase: #include the file we want to wrap. %{ #include "util/packed_array.h" #include "graph/ebert_graph.h" @@ -49,6 +49,8 @@ %rename(supply) operations_research::MinCostFlow::Supply; #endif // SWIGJAVA +// Second phase: %include the same files. + %include "util/packed_array.h" %include "graph/ebert_graph.h" %include "graph/max_flow.h" diff --git a/graph/graph.h b/graph/graph.h index 518cf2812e..67517cc746 100644 --- a/graph/graph.h +++ b/graph/graph.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/graph/hamiltonian_path.h b/graph/hamiltonian_path.h index 9c2589a758..0da7e81019 100644 --- a/graph/hamiltonian_path.h +++ b/graph/hamiltonian_path.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/graph/max_flow.cc b/graph/max_flow.cc index 80bdf6b9e2..9a7b421b3c 100644 --- a/graph/max_flow.cc +++ b/graph/max_flow.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/graph/max_flow.h b/graph/max_flow.h index 40f631ec16..9241b730a6 100644 --- a/graph/max_flow.h +++ b/graph/max_flow.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/graph/min_cost_flow.cc b/graph/min_cost_flow.cc index c4e782aef0..a3b87ac0c2 100644 --- a/graph/min_cost_flow.cc +++ b/graph/min_cost_flow.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/graph/min_cost_flow.h b/graph/min_cost_flow.h index c6a911a830..ef139238f2 100644 --- a/graph/min_cost_flow.h +++ b/graph/min_cost_flow.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/graph/shortestpaths.cc b/graph/shortestpaths.cc index 1c4494cbaa..68cd8f3e1e 100644 --- a/graph/shortestpaths.cc +++ b/graph/shortestpaths.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/graph/shortestpaths.h b/graph/shortestpaths.h index cb85cf88e3..85c14f3026 100644 --- a/graph/shortestpaths.h +++ b/graph/shortestpaths.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/linear_solver/cbc_interface.cc b/linear_solver/cbc_interface.cc index d472484c0c..57bee13d75 100644 --- a/linear_solver/cbc_interface.cc +++ b/linear_solver/cbc_interface.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/linear_solver/clp_interface.cc b/linear_solver/clp_interface.cc index 8781c81d5d..ff36aa1a0a 100644 --- a/linear_solver/clp_interface.cc +++ b/linear_solver/clp_interface.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/linear_solver/glpk_interface.cc b/linear_solver/glpk_interface.cc index eb4c7fe425..a1478c318f 100644 --- a/linear_solver/glpk_interface.cc +++ b/linear_solver/glpk_interface.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/linear_solver/linear_solver.cc b/linear_solver/linear_solver.cc index eff4171606..8de3712cff 100644 --- a/linear_solver/linear_solver.cc +++ b/linear_solver/linear_solver.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/linear_solver/linear_solver.h b/linear_solver/linear_solver.h index 56beb87ec9..5afe4e6da8 100644 --- a/linear_solver/linear_solver.h +++ b/linear_solver/linear_solver.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/linear_solver/linear_solver.proto b/linear_solver/linear_solver.proto index 5191b3d84b..f52ec72527 100644 --- a/linear_solver/linear_solver.proto +++ b/linear_solver/linear_solver.proto @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/linear_solver/linear_solver.swig b/linear_solver/linear_solver.swig index 338f957e21..8fa86b3868 100644 --- a/linear_solver/linear_solver.swig +++ b/linear_solver/linear_solver.swig @@ -1,5 +1,15 @@ -// Copyright (C) 2009 and onwards Google -// lperron@google.com (Laurent Perron) +// Copyright 2010-2011 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. %include "base/base.swig" diff --git a/python/golomb8.py b/python/golomb8.py index 569ed612db..fd235b87c4 100644 --- a/python/golomb8.py +++ b/python/golomb8.py @@ -1,4 +1,4 @@ -# Copyright 2010 Google +# Copyright 2010-2011 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/python/hidato_table.py b/python/hidato_table.py index 1281989f52..13abee5ee3 100644 --- a/python/hidato_table.py +++ b/python/hidato_table.py @@ -1,4 +1,4 @@ -# Copyright 2010 Google +# Copyright 2010-2011 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/python/integer_solver_example.py b/python/integer_solver_example.py index 37745bb20c..9dcb683a60 100644 --- a/python/integer_solver_example.py +++ b/python/integer_solver_example.py @@ -1,4 +1,4 @@ -# Copyright 2010 Google +# Copyright 2010-2011 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/python/jobshop_ft06.py b/python/jobshop_ft06.py index a0b570d457..f1c325dbbf 100644 --- a/python/jobshop_ft06.py +++ b/python/jobshop_ft06.py @@ -1,4 +1,4 @@ -# Copyright 2010 Google +# Copyright 2010-2011 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/python/knapsack.py b/python/knapsack.py index 54710935f1..a9ac183df0 100644 --- a/python/knapsack.py +++ b/python/knapsack.py @@ -1,4 +1,4 @@ -# Copyright 2010 Google +# Copyright 2010-2011 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/python/linear_solver_example.py b/python/linear_solver_example.py index f345781559..93d100e598 100644 --- a/python/linear_solver_example.py +++ b/python/linear_solver_example.py @@ -1,4 +1,4 @@ -# Copyright 2010 Google +# Copyright 2010-2011 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/python/magic_sequence_distribute.py b/python/magic_sequence_distribute.py index b14a73c3bb..bff3004640 100644 --- a/python/magic_sequence_distribute.py +++ b/python/magic_sequence_distribute.py @@ -1,4 +1,4 @@ -# Copyright 2010 Google +# Copyright 2010-2011 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/python/pyflow_example.py b/python/pyflow_example.py index a1ee5f531f..0b781383e0 100644 --- a/python/pyflow_example.py +++ b/python/pyflow_example.py @@ -1,4 +1,4 @@ -# Copyright 2010 Google +# Copyright 2010-2011 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/python/rabbit_pheasant.py b/python/rabbit_pheasant.py index 88310eb4ed..640d39b83e 100644 --- a/python/rabbit_pheasant.py +++ b/python/rabbit_pheasant.py @@ -1,4 +1,4 @@ -# Copyright 2010 Google +# Copyright 2010-2011 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/python/sendmore.py b/python/sendmore.py index cd477fa334..82d593bc76 100644 --- a/python/sendmore.py +++ b/python/sendmore.py @@ -1,4 +1,4 @@ -# Copyright 2010 Google +# Copyright 2010-2011 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/python/simple_meeting.py b/python/simple_meeting.py index d1555e2ce3..247defae29 100644 --- a/python/simple_meeting.py +++ b/python/simple_meeting.py @@ -1,4 +1,4 @@ -# Copyright 2010 Google +# Copyright 2010-2011 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/python/sudoku.py b/python/sudoku.py index 505b131e6e..6a8e06eb99 100644 --- a/python/sudoku.py +++ b/python/sudoku.py @@ -1,4 +1,4 @@ -# Copyright 2010 Google +# Copyright 2010-2011 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/python/tsp.py b/python/tsp.py index 3c7c370f2b..617eb7d5e7 100644 --- a/python/tsp.py +++ b/python/tsp.py @@ -1,4 +1,4 @@ -# Copyright 2010 Google +# Copyright 2010-2011 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/python/zebra.py b/python/zebra.py index ce3441449b..f39eb763d6 100644 --- a/python/zebra.py +++ b/python/zebra.py @@ -1,4 +1,4 @@ -# Copyright 2010 Google +# Copyright 2010-2011 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/util/bitset.cc b/util/bitset.cc index 3a928c7173..962df37c5e 100644 --- a/util/bitset.cc +++ b/util/bitset.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/util/bitset.h b/util/bitset.h index a90270d1a9..6d9c857055 100644 --- a/util/bitset.h +++ b/util/bitset.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/util/cached_log.cc b/util/cached_log.cc index c3a3306a1e..e845ba6dba 100644 --- a/util/cached_log.cc +++ b/util/cached_log.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/util/cached_log.h b/util/cached_log.h index c74394ce93..0b5bb0c5d5 100644 --- a/util/cached_log.h +++ b/util/cached_log.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/util/data.swig b/util/data.swig index 200bfdf4c7..3efe924c54 100644 --- a/util/data.swig +++ b/util/data.swig @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/util/monoid_operation_tree.h b/util/monoid_operation_tree.h index 1f993a1fd9..fd05e5de8e 100644 --- a/util/monoid_operation_tree.h +++ b/util/monoid_operation_tree.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/util/packed_array.h b/util/packed_array.h index 97cbb5e8e7..99b3a97164 100644 --- a/util/packed_array.h +++ b/util/packed_array.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/util/xml_helper.cc b/util/xml_helper.cc index 8f19001878..1d71894100 100644 --- a/util/xml_helper.cc +++ b/util/xml_helper.cc @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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/util/xml_helper.h b/util/xml_helper.h index c8a332018c..1bd5beab46 100644 --- a/util/xml_helper.h +++ b/util/xml_helper.h @@ -1,4 +1,4 @@ -// Copyright 2010 Google +// Copyright 2010-2011 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