Skip to content

Commit

Permalink
1.0.591 release
Browse files Browse the repository at this point in the history
  • Loading branch information
vlkong committed Aug 30, 2016
1 parent 3de3340 commit 6d6cabb
Show file tree
Hide file tree
Showing 46 changed files with 110 additions and 3,313 deletions.
2 changes: 1 addition & 1 deletion examples/cp/basic/color.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
# Solve model
print("\nSolving model....")
# You can set here custom DOcplexcloud URL and key if not done in docloud_config.py
msol = mdl.solve(url="ENTER YOUR URL HERE", key="ENTER YOUR KEY HERE")
msol = mdl.solve(TimeLimit=10, url="ENTER YOUR URL HERE", key="ENTER YOUR KEY HERE")

if msol:
print("Solution status: " + msol.get_solve_status())
Expand Down
2 changes: 1 addition & 1 deletion examples/cp/basic/facility.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,5 @@

# Solve model
print("\nSolving model....")
msol = mdl.solve()
msol = mdl.solve(TimeLimit=10)
msol.print_solution()
2 changes: 1 addition & 1 deletion examples/cp/basic/golomb_ruler.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

# Solve model
print("\nSolving model....")
msol = mdl.solve()
msol = mdl.solve(TimeLimit=100)

# Print solution
if msol:
Expand Down
2 changes: 1 addition & 1 deletion examples/cp/basic/hitori.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ def conditional(c, t, e):

# Solve model
print("\nSolving model....")
msol = mdl.solve()
msol = mdl.solve(TimeLimit=100)

# Print solution
stdout.write("Initial problem:\n")
Expand Down
2 changes: 1 addition & 1 deletion examples/cp/basic/latin_cube.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@

# Solve model
print("\nSolving model....")
msol = mdl.solve()
msol = mdl.solve(TimeLimit=10)

# Print solution
stdout.write("Solution:\n")
Expand Down
2 changes: 1 addition & 1 deletion examples/cp/basic/latin_square.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

# Solve model
print("\nSolving model....")
msol = mdl.solve()
msol = mdl.solve(TimeLimit=10)

# Print solution
stdout.write("Solution:\n")
Expand Down
2 changes: 1 addition & 1 deletion examples/cp/basic/light_up.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ def conditional(c, t, e):

# Solve model
print("\nSolving model....")
msol = mdl.solve()
msol = mdl.solve(TimeLimit=10)

# Print solution
stdout.write("Initial problem:\n")
Expand Down
2 changes: 1 addition & 1 deletion examples/cp/basic/linear_peg_solitaire.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
# Solve model
#mdl.export_as_cpo(srcloc=False)
print("Solving model....")
msol = mdl.solve(TimeLimit=100)
msol = mdl.solve(TimeLimit=50)

# Print solution
if msol:
Expand Down
2 changes: 1 addition & 1 deletion examples/cp/basic/n_queen.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

# Solve model
print("Solving model....")
msol = mdl.solve()
msol = mdl.solve(TimeLimit=10)

# Print solution
if msol:
Expand Down
2 changes: 1 addition & 1 deletion examples/cp/basic/steelmill.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@

# Solve model
print("Solving model....")
msol = mdl.solve(FailLimit=100000)
msol = mdl.solve(FailLimit=100000, TimeLimit=10)

# Print solution
if msol:
Expand Down
2 changes: 1 addition & 1 deletion examples/cp/basic/sudoku.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def print_grid(grid):

# Solve model
print("\nSolving model....")
msol = mdl.solve()
msol = mdl.solve(TimeLimit=10)

# Print solution
stdout.write("Initial problem:\n")
Expand Down
2 changes: 1 addition & 1 deletion examples/cp/basic/truck_fleet.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@

# Solve model
print("\nSolving model....")
msol = mdl.solve(TimeLimit=30, LogPeriod=3000)
msol = mdl.solve(TimeLimit=20, LogPeriod=3000)

# Print solution
if msol.is_solution():
Expand Down
Loading

0 comments on commit 6d6cabb

Please sign in to comment.