add a ortools package for python modules; kept compatibility; updated all examples

examples/python/3_jugs_mip.py

@@ -28,7 +28,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import sys
-from linear_solver import pywraplp
+from ortools.linear_solver import pywraplp
 
 def main(sol = 'GLPK'):
 

examples/python/3_jugs_regular.py

@@ -47,7 +47,7 @@
 
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 from collections import defaultdict
 
 #

examples/python/a_round_of_golf.py

@@ -64,7 +64,7 @@
 
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 def main():
 

examples/python/all_interval.py

@@ -51,7 +51,7 @@
 """
 import string, sys
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 def main(n=12):
 

examples/python/alldifferent_except_0.py

@@ -51,7 +51,7 @@
 
 
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 #
 # Decomposition of alldifferent_except_0

examples/python/alphametic.py

@@ -45,7 +45,7 @@
 """
 import sys, string, re
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 def main(problem_str="SEND+MORE=MONEY", base=10):
 

examples/python/assignment.py

@@ -31,7 +31,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main(cost, rows, cols):

examples/python/assignment6_mip.py

@@ -40,7 +40,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import sys
-from linear_solver import pywraplp
+from ortools.linear_solver import pywraplp
 
 def main(sol = 'GLPK'):
 

examples/python/bacp.py

@@ -14,7 +14,7 @@
 
 from google.apputils import app
 import gflags
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 FLAGS = gflags.FLAGS
 

examples/python/blending.py

@@ -22,7 +22,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import sys
-from linear_solver import pywraplp
+from ortools.linear_solver import pywraplp
 
 
 def main(sol = 'GLPK'):

examples/python/broken_weights.py

@@ -49,7 +49,7 @@
 import sys
 import string
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main(m=40, n=4):

examples/python/bus_schedule.py

@@ -36,7 +36,7 @@
 
 import sys
 import string
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 

examples/python/car.py

@@ -32,7 +32,7 @@
 import sys
 import string
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main(num_sol=3):

examples/python/circuit.py

@@ -43,7 +43,7 @@
 
 import sys
 import string
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 #
 # circuit(x)

examples/python/coins3.py

@@ -37,7 +37,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import sys, string
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/coins_grid.py

@@ -53,7 +53,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 def main(unused_argv):
   # Create the solver.

examples/python/coins_grid_mip.py

@@ -40,7 +40,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from linear_solver import pywraplp
+from ortools.linear_solver import pywraplp
 
 def main(unused_argv):
 

examples/python/coloring_ip.py

@@ -38,7 +38,7 @@
 """
 
 import sys
-from linear_solver import pywraplp
+from ortools.linear_solver import pywraplp
 
 
 def main(sol = 'GLPK'):

examples/python/combinatorial_auction2.py

@@ -32,7 +32,7 @@
 """
 import sys,string
 from collections import *
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/contiguity_regular.py

@@ -40,7 +40,7 @@
   
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 #
 # Global constraint regular

examples/python/costas_array.py

@@ -62,7 +62,7 @@
 import sys
 import string
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main(n=6):

examples/python/covering_opl.py

@@ -59,7 +59,7 @@
 import sys
 import string
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/crew.py

@@ -38,7 +38,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import sys, string
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 def main(sols=1):
 

examples/python/crossword2.py

@@ -57,7 +57,7 @@
 """
 
 from google.apputils import app
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main(_):

examples/python/crypta.py

@@ -44,7 +44,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/crypto.py

@@ -43,7 +43,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/curious_set_of_integers.py

@@ -59,7 +59,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def decreasing(solver, x):

examples/python/debruijn_binary.py

@@ -40,7 +40,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import sys, string
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 # converts a number (s) <-> an array of numbers (t) in the specific base.
 def toNum(solver, t, s, base):

examples/python/diet1.py

@@ -44,7 +44,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 

examples/python/diet1_b.py

@@ -46,7 +46,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 

examples/python/diet1_mip.py

@@ -36,7 +36,7 @@
 """
 
 import sys
-from linear_solver import pywraplp
+from ortools.linear_solver import pywraplp
 
 
 def main(sol = 'GLPK'):

examples/python/discrete_tomography.py

@@ -54,7 +54,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import sys
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main(row_sums="", col_sums=""):

examples/python/divisible_by_9_through_1.py

@@ -53,7 +53,7 @@
 """
 import string, sys
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 #
 # Decomposition of modulo constraint

examples/python/dudeney.py

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 def dudeney(n):
   solver = pywrapcp.Solver('Dudeney')

examples/python/einav_puzzle.py

@@ -63,7 +63,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/einav_puzzle2.py

@@ -64,7 +64,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/eq10.py

@@ -27,7 +27,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/eq20.py

@@ -27,7 +27,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/fill_a_pix.py

@@ -50,7 +50,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import sys
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 # Puzzle 1 from

examples/python/furniture_moving.py

@@ -36,7 +36,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import sys, string
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 #

examples/python/futoshiki.py

@@ -45,7 +45,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main(values, lt):

examples/python/game_theory_taha.py

@@ -25,7 +25,7 @@
 """
 
 import sys
-from linear_solver import pywraplp
+from ortools.linear_solver import pywraplp
 
 def main(sol = 'GLPK'):
 

examples/python/golomb8.py

@@ -26,7 +26,7 @@ of the rule.
 
 from google.apputils import app
 import gflags
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 FLAGS = gflags.FLAGS
 

examples/python/grocery.py

@@ -39,7 +39,7 @@
 import sys
 import string
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/hidato.py

@@ -41,7 +41,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/hidato_table.py

@@ -26,7 +26,7 @@
 """
 
 from google.apputils import app
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def BuildPairs(rows, cols):

examples/python/integer_programming.py

@@ -17,7 +17,7 @@
 
 from google.apputils import app
 
-from linear_solver import pywraplp
+from ortools.linear_solver import pywraplp
 
 
 def RunIntegerExampleNaturalLanguageAPI(optimization_problem_type):

examples/python/jobshop_ft06.py

@@ -27,7 +27,7 @@ jobs. This is called the makespan.
 
 from google.apputils import app
 import gflags
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 FLAGS = gflags.FLAGS
 

examples/python/just_forgotten.py

@@ -45,7 +45,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/kakuro.py

@@ -57,7 +57,7 @@
 
 import sys
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 #
 # Ensure that the sum of the segments

examples/python/kenken2.py

@@ -58,7 +58,7 @@
 
 import sys
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 #
 # Ensure that the sum of the segments

examples/python/killer_sudoku.py

@@ -69,7 +69,7 @@
 
 import sys
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 #
 # Ensure that the sum of the segments

examples/python/knapsack.py

@@ -18,7 +18,7 @@
 
 from google.apputils import app
 import gflags
-from algorithms import pywrapknapsack_solver
+from ortools.algorithms import pywrapknapsack_solver
 
 FLAGS = gflags.FLAGS
 

examples/python/knapsack_cp.py

@@ -22,7 +22,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 def knapsack(solver, values, weights, n):
     z = solver.IntVar(0, 10000)

examples/python/knapsack_mip.py

@@ -22,7 +22,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import sys
-from linear_solver import pywraplp
+from ortools.linear_solver import pywraplp
 
 def main(sol = 'GLPK'):
 

examples/python/labeled_dice.py

@@ -47,7 +47,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/langford.py

@@ -47,7 +47,7 @@
 import sys
 import string
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main(k=8, num_sol=0):

examples/python/least_diff.py

@@ -37,7 +37,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_cp_solver/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 def main(unused_argv):
   # Create the solver.

examples/python/least_square.py

@@ -26,7 +26,7 @@
 """
 
 import sys
-from linear_solver import pywraplp
+from ortools.linear_solver import pywraplp
 
 def main(sol = 'GLPK'):
 

examples/python/lectures.py

@@ -45,7 +45,7 @@
 """
 
 import sys
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/linear_assignment_api.py

@@ -21,7 +21,7 @@
 
 
 from google.apputils import app
-from graph import pywrapgraph
+from ortools.graph import pywrapgraph
 
 
 def RunAssignmentOn4x4Matrix():

examples/python/linear_programming.py

@@ -16,7 +16,7 @@
 
 from google.apputils import app
 
-from linear_solver import pywraplp
+from ortools.linear_solver import pywraplp
 
 
 def RunLinearExampleNaturalLanguageAPI(optimization_problem_type):

examples/python/magic_sequence_distribute.py

@@ -24,7 +24,7 @@ distribute().
 
 from google.apputils import app
 import gflags
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 FLAGS = gflags.FLAGS
 

examples/python/magic_square.py

@@ -22,7 +22,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import string, sys
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main(n=4):

examples/python/magic_square_and_cards.py

@@ -28,7 +28,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import string, sys
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main(n=3):

examples/python/magic_square_mip.py

@@ -42,7 +42,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import sys
-from linear_solver import pywraplp
+from ortools.linear_solver import pywraplp
 
 #
 # main(n, use_output_matrix)

examples/python/map.py

@@ -33,7 +33,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/marathon2.py

@@ -48,7 +48,7 @@
 """
 
 import sys
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/max_flow_taha.py

@@ -28,7 +28,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 def main():
 

examples/python/max_flow_winston1.py

@@ -28,7 +28,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import sys
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/minesweeper.py

@@ -63,7 +63,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import sys
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 default_r = 8
 default_c = 8

examples/python/mr_smith.py

@@ -48,7 +48,7 @@
 """
 
 import sys
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/nonogram_default_search.py

@@ -43,7 +43,7 @@
 
 import sys
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 #

examples/python/nonogram_regular.py

@@ -67,7 +67,7 @@
 
 import sys
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 #

examples/python/nonogram_table.py

@@ -67,7 +67,7 @@
 
 import sys
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 #

examples/python/nonogram_table2.py

@@ -67,7 +67,7 @@
 
 import sys
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 #

examples/python/nontransitive_dice.py

@@ -68,7 +68,7 @@
 """
 import sys
 import string
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 def main(m=3, n=6, minimize_val=0):
 

examples/python/nqueens.py

@@ -22,7 +22,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main(n=8):

examples/python/nqueens2.py

@@ -25,7 +25,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import sys, string
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main(n=8):

examples/python/nqueens3.py

@@ -27,7 +27,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import sys, string
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main(n=8, num_sol=0, print_sol=1):

examples/python/nurse_rostering.py

@@ -29,7 +29,7 @@
 
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 from collections import defaultdict
 
 #

examples/python/olympic.py

@@ -57,7 +57,7 @@
 """
 
 import sys
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 def minus(solver, x, y, z):
     solver.Add(z == abs(x - y))

examples/python/organize_day.py

@@ -33,7 +33,7 @@
 """
 
 import sys
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 #
 # No overlapping of tasks s1 and s2

examples/python/p_median.py

@@ -35,7 +35,7 @@
 """
 
 import sys
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/pandigital_numbers.py

@@ -63,7 +63,7 @@
 
 import string, sys
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 #
 # converts a number (s) <-> an array of integers (t) in the specific base.

examples/python/photo_problem.py

@@ -49,7 +49,7 @@
 import sys
 import string
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main(show_all_max=0):

examples/python/place_number_puzzle.py

@@ -42,7 +42,7 @@
 
 import sys
 import string
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 def main():
 

examples/python/post_office_problem2.py

@@ -54,7 +54,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/production.py

@@ -17,16 +17,16 @@
   Production planning problem in Google or-tools.
 
   From the OPL model production.mod.
-  
+
   This model was created by Hakan Kjellerstrand (hakank@bonetmail.com)
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
 import sys
-from linear_solver import pywraplp
+from ortools.linear_solver import pywraplp
 
 def main(sol = 'GLPK'):
-  
+
   # Create the solver.
 
   # using GLPK
@@ -65,7 +65,7 @@ def main(sol = 'GLPK'):
   inside = [solver.NumVar(0, 10000, 'inside[%i]' % p )
             for p in range(num_products)]
   outside = [solver.NumVar(0, 10000, 'outside[%i]' % p )
-             for p in range(num_products)]  
+             for p in range(num_products)]
 
   # to minimize
   z = solver.Sum([inside_cost[p] * inside[p] + outside_cost[p] * outside[p]
@@ -93,7 +93,7 @@ def main(sol = 'GLPK'):
      print 'outside:', outside[p].SolutionValue(), ' (ReducedCost:', outside[p].ReducedCost(), ')'
   print
 
- 
+
 if __name__ == '__main__':
 
   sol = 'GLPK'
@@ -102,5 +102,5 @@ if __name__ == '__main__':
     if sol != 'GLPK' and sol != 'CBC':
       print 'Solver must be either GLPK or CBC'
       sys.exit(1)
-  
+
   main(sol)

examples/python/pyflow_example.py

@@ -16,7 +16,7 @@
 
 
 from google.apputils import app
-from graph import pywrapgraph
+from ortools.graph import pywrapgraph
 
 
 def MaxFlow():

examples/python/quasigroup_completion.py

@@ -51,7 +51,7 @@
 """
 
 import sys
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 default_n = 5
 X = 0

examples/python/rabbit_pheasant.py

@@ -23,7 +23,7 @@ flavors of constraint programming interfaces.
 
 
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/regular.py

@@ -38,7 +38,7 @@
 
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 #

examples/python/regular_table.py

@@ -38,7 +38,7 @@
 
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 #

examples/python/regular_table2.py

@@ -38,7 +38,7 @@
 
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 #

examples/python/rogo2.py

@@ -46,7 +46,7 @@
 """
 import sys, string, re
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 def main(problem, rows, cols, max_steps):
 

examples/python/safe_cracking.py

@@ -45,7 +45,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/scheduling_speakers.py

@@ -29,7 +29,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/secret_santa.py

@@ -60,7 +60,7 @@
   Also see my other Google CP Solver models: http://www.hakank.org/google_or_tools/
 """
 import sys
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main():

examples/python/secret_santa2.py

@@ -62,7 +62,7 @@
 """
 
 import sys
-from constraint_solver import pywrapcp
+from ortools.constraint_solver import pywrapcp
 
 
 def main(singe=0):