correct Hakan email address

examples/com/google/ortools/samples/AllDifferentExcept0.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/AllInterval.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/Circuit.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/CoinsGrid.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/CoinsGridMIP.java

@@ -37,7 +37,7 @@
  *  	  which is the MIP version of
  *  		http://www.hakank.org/google_or_tools/coins_grid.py
  *  
- *  	  by Hakan Kjellerstrand (hakank@bonetmail.com).
+ *  	  by Hakan Kjellerstrand (hakank@gmail.com).
  *  
  *  Java version by Darian Sastre (darian.sastre@minimaxlabs.com)
  */

examples/com/google/ortools/samples/ColoringMIP.java

@@ -14,7 +14,7 @@
  * 
  * ************************************************************************
  * 
- * This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+ * This model was created by Hakan Kjellerstrand (hakank@gmail.com)
  *
  * Java version by Darian Sastre (darian.sastre@minimaxlabs.com)
  */ 

examples/com/google/ortools/samples/CoveringOpl.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/Crossword.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/DeBruijn.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/Diet.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/DietMIP.java

@@ -15,7 +15,7 @@
  * 
  * ************************************************************************
  * 
- * This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+ * This model was created by Hakan Kjellerstrand (hakank@gmail.com)
  */
 
 import com.google.ortools.linearsolver.MPConstraint;

examples/com/google/ortools/samples/DivisibleBy9Through1.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/KnapsackMIP.java

@@ -18,7 +18,7 @@
  * the same across knapsacks. Optimizing constrains the count of each item such 
  * that all knapsack capacities are respected, and their values are maximized.
  * 
- * This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+ * This model was created by Hakan Kjellerstrand (hakank@gmail.com)
  */ 
 
 import com.google.ortools.linearsolver.*;

examples/com/google/ortools/samples/LeastDiff.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/MagicSquare.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/Map.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/Map2.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/Minesweeper.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/NQueens.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/NQueens2.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/QuasigroupCompletion.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/SendMoreMoney.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/SendMoreMoney2.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/SendMostMoney.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/Seseman.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/SetCovering.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/SetCovering2.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/SetCovering3.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/SetCovering4.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/SetCoveringDeployment.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/StableMarriage.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/StiglerMIP.java

@@ -14,7 +14,7 @@
  * 
  * ************************************************************************
  * 
- * This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+ * This model was created by Hakan Kjellerstrand (hakank@gmail.com)
  *
  * Java version by Darian Sastre (darian.sastre@minimaxlabs.com)
  */ 

examples/com/google/ortools/samples/Strimko2.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/Sudoku.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/SurvoPuzzle.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/ToNum.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/WhoKilledAgatha.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/Xkcd.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/com/google/ortools/samples/YoungTableaux.java

@@ -1,4 +1,4 @@
-// Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+// Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

examples/python/3_jugs_mip.py

@@ -1,4 +1,4 @@
-# Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
   Compare with the CP model:
      http://www.hakank.org/google_or_tools/3_jugs_regular
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/3_jugs_regular.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@
   * Gecode: http://www.hakank.org/gecode/3_jugs2.cpp
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 

examples/python/a_round_of_golf.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@
   * Gecode  :  http://hakank.org/gecode/a_round_of_golf.cpp
   * SICStus : http://hakank.org/sicstus/a_round_of_golf.pl
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 

examples/python/all_interval.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@
   * SICStus : http://www.hakank.org/sicstus/all_interval.pl
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 

examples/python/alldifferent_except_0.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@
   * JaCoP: http://hakank.org/JaCoP/AllDifferentExcept0_test.java
   * Zinc: http://hakank.org/minizinc/alldifferent_except_0.zinc
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 

examples/python/alphametic.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@
   Compare with the following model:
   * Zinc: http://www.hakank.org/minizinc/alphametic.zinc
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 

examples/python/assignment.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
   * Tailor/Essence': http://www.hakank.org/tailor/assignment.eprime
   * SICStus: http://hakank.org/sicstus/assignment.pl
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/assignment6_mip.py

@@ -1,4 +1,4 @@
-# Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
      http://www.hakank.org/comet/assignment6.co
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/blending.py

@@ -1,4 +1,4 @@
-# Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 
   From the OPL model blending.mod.
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/broken_weights.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@
   * Gecode: http://www.hakank.org/gecode/broken_weights.cpp
   * Comet: http://hakank.org/comet/broken_weights.co
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/bus_schedule.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
   * Tailor/Essence'  : http://www.hakank.org/tailor/bus_schedule.eprime
   * SICStus: http://hakank.org/sicstus/bus_schedule.pl
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 

examples/python/car.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
   * MiniZinc: http://hakank.org/minizinc/car.mzn
   * Comet: http://hakank.org/comet/car.co
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/circuit.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
   * Gecode: http://www.hakank.org/gecode/circuit_orbit.mzn
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 

examples/python/coins3.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
   * SICStus : http://hakank.org/sicstus/coins3.pl
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/coins_grid.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@
   * Gecode/R: http://hakank.org/gecode_r/coins_grid.rb
   * JaCoP: http://hakank.org/JaCoP/CoinsGrid.java
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/coins_grid_mip.py

@@ -1,4 +1,4 @@
-# Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
      http://www.hakank.org/google_or_tools/coins_grid.py
   and use
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/coloring_ip.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
   Compare with the MiniZinc model:
     http://www.hakank.org/minizinc/coloring_ip.mzn
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/combinatorial_auction2.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
   * MiniZinc: http://hakank.org/minizinc/combinatorial_auction.mzn
   * Gecode: http://hakank.org/gecode/combinatorial_auction.cpp
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/contiguity_regular.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
   Compare with the following model:
   * MiniZinc: http://www.hakank.org/minizinc/contiguity_regular.mzn
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 

examples/python/costas_array.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@
   872, 200, 88, 56, 204,...
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/covering_opl.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@
   * Gecode: http://hakank.org/gecode/covering_opl.cpp
   * SICStus: http://hakank.org/sicstus/covering_opl.pl
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/crew.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@
   * SICStus : http://hakank.org/sicstus/crew.pl
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/crossword2.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@
   * SICStus: http://hakank.org/sicstus/crossword2.pl
   * Zinc: http://hakank.org/minizinc/crossword2.zinc
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/crypta.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
   * Gecode: http://hakank.org/gecode/crypta.cpp
   * SICStus: http://hakank.org/sicstus/crypta.pl
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/crypto.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@
   * SICStus : http://hakank.org/sicstus/crypta.pl
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/curious_set_of_integers.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@
   * SICStus : http://hakank.org/sicstus/crypta.pl
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/debruijn_binary.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
   * Gecode/R: http://hakank.org/gecode_r/debruijn_binary.rb
   * JaCoP: http://hakank.org/JaCoP/DeBruijn.java
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/diet1.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
   * JaCoP: http://hakank.org/JaCoP/Diet.java
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/diet1_b.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@
   This version use ScalProd() instead of Sum().
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/diet1_mip.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
     http://www.hakank.org/google_or_tools/diet1.py
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/discrete_tomography.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -50,7 +50,7 @@
  * Tailor/Essence': http://www.hakank.org/tailor/tomography.eprime
  * SICStus: http://hakank.org/sicstus/discrete_tomography.pl
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/divisible_by_9_through_1.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@
   * Gecode  : http://www.hakank.org/gecode/divisible_by_9_through_1.cpp
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 

examples/python/einav_puzzle.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@
   decision variables as this version.
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/einav_puzzle2.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@
   Thanks!
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/eq10.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
   * ECLiPSe: http://hakank.org/eclipse/eq10.ecl
   * SICStus: http://hakank.org/sicstus/eq10.pl
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/eq20.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
   * ECLiPSe: http://hakank.org/eclipse/eq20.ecl
   * SICStus: http://hakank.org/sicstus/eq20.pl
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/fill_a_pix.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@
   * http://www.hakank.org/google_or_tools/minesweeper.py
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/furniture_moving.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
   * Zinc: http://hakank.org/minizinc/furniture_moving.zinc
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/futoshiki.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
   * Gecode: http://hakank.org/gecode/futoshiki.cpp
   * SICStus: http://hakank.org/sicstus/futoshiki.pl
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/game_theory_taha.py

@@ -1,4 +1,4 @@
-# Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
   From Taha, Operations Research (8'th edition), page 528.
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/grocery.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
   * Comet: http://hakank.org/comet/grocery.co
   * Zinc: http://hakank.org/minizinc/grocery.zinc
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/hidato.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@
   Note: This model is very slow. Please see Laurent Perron's much faster
         (and more elegant) model: hidato_table.py .
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/just_forgotten.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
   * ECLiPSe: http://hakank.org/eclipse/just_forgotten.ecl
   * Gecpde: http://hakank.org/gecode/just_forgotten.cpp
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/kakuro.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@
   * ECLiPSe: http://www.hakank.org/eclipse/kakuro.ecl
   * Gecode: http://www.hakank.org/gecode/kenken2.cpp
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/kenken2.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@
 
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/killer_sudoku.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@
   * Gecode: http://www.hakank.org/gecode/killer_sudoku.cpp
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/knapsack_cp.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 
   Simple knapsack problem.
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/knapsack_mip.py

@@ -1,4 +1,4 @@
-# Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 
   From the OPL model knapsack.mod
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/labeled_dice.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@
   * Zinc   : http://hakank.org/minizinc/labeled_dice.zinc
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/langford.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
   * SICStus: http://hakank.org/sicstus/langford.pl
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/least_diff.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
   * SICStus : http://www.hakank.org/sicstus/least_diff.pl
   * Zinc    : http://hakank.org/minizinc/least_diff.zinc
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_cp_solver/
 """

examples/python/least_square.py

@@ -1,4 +1,4 @@
-# Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   From the Swedish book 'Optimeringslara' [Optimization Theory],
   page 286f.
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/lectures.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
  * Gecode: http://hakank.org/gecode/lectures.cpp
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/magic_square.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 
   Magic square problem.
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/magic_square_and_cards.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/magic_square_mip.py

@@ -1,4 +1,4 @@
-# Copyright 2011 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2011 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
   using an output_matrix (much longer).
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/map.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
   * MiniZinc: http://hakank.org/minizinc/map.mzn
   * Zinc: http://hakank.org/minizinc/map.zinc
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/marathon2.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@
   * Gecode: http://hakank.org/gecode/marathon2.cpp
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/max_flow_taha.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
   Compare with the following model:
   * MiniZinc: http://www.hakank.org/minizinc/max_flow_taha.mzn
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/max_flow_winston1.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
   * Comet: http://hakank.org/comet/max_flow_winston1.co
 
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """

examples/python/minesweeper.py

@@ -1,4 +1,4 @@
-# Copyright 2010 Hakan Kjellerstrand hakank@bonetmail.com
+# Copyright 2010 Hakan Kjellerstrand hakank@gmail.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@
   * Tailor/Essence': http://www.hakank.org/tailor/minesweeper.eprime
   * Zinc: http://www.hakank.org/minizinc/minesweeper.zinc
 
-  This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
+  This model was created by Hakan Kjellerstrand (hakank@gmail.com)
   Also see my other Google CP Solver models:
   http://www.hakank.org/google_or_tools/
 """