diff --git a/examples/python/jobshop_with_maintenance_sat.py b/examples/python/jobshop_with_maintenance_sat.py index 2d2027fb62..015d11019c 100644 --- a/examples/python/jobshop_with_maintenance_sat.py +++ b/examples/python/jobshop_with_maintenance_sat.py @@ -97,33 +97,33 @@ def main(): index=t, duration=task[1])) - # Create per machine output lines. - sol_line = '' - sol_line_tasks = '' - + # Create per machine output lines. + output = '' for machine in all_machines: # Sort by starting time. assigned_jobs[machine].sort() - sol_line += ' machine ' + str(machine) + ': ' - sol_line_tasks += ' machine ' + str(machine) + ': ' + sol_line_tasks = ' - machine ' + str(machine) + ': ' + sol_line = ' ' for assigned_task in assigned_jobs[machine]: name = 'job_%i_%i' % (assigned_task.job, assigned_task.index) - sol_line_tasks += '%10s' % name - + # Add spaces to output to align columns. + sol_line_tasks += '%-10s' % name start = assigned_task.start - duration = assigned_task.duration - sol_tmp = '[%2i,%2i]' % (start, start + duration) - sol_line += '%10s' % sol_tmp + duration = jobs_data[assigned_task.job][assigned_task.index][1] + + sol_tmp = '[%i,%i]' % (start, start + duration) + # Add spaces to output to align columns. + sol_line += '%-10s' % sol_tmp sol_line += '\n' sol_line_tasks += '\n' + output += sol_line_tasks + output += sol_line # Finally print the solution found. print('Optimal Schedule') - print(sol_line_tasks) - print('Task Time Intervals') - print(sol_line) + print(output) if __name__ == '__main__': diff --git a/ortools/sat/samples/minimal_jobshop_sat.py b/ortools/sat/samples/minimal_jobshop_sat.py index b8c53b0d42..2fd7623a97 100644 --- a/ortools/sat/samples/minimal_jobshop_sat.py +++ b/ortools/sat/samples/minimal_jobshop_sat.py @@ -114,34 +114,32 @@ def MinimalJobshopSat(): # Create per machine output lines. - sol_line = '' - sol_line_tasks = '' - + output = '' for machine in all_machines: # Sort by starting time. assigned_jobs[machine].sort() - sol_line += ' - machine ' + str(machine) + ': ' - sol_line_tasks += ' - machine ' + str(machine) + ': ' + sol_line_tasks = ' - machine ' + str(machine) + ': ' + sol_line = ' ' for assigned_task in assigned_jobs[machine]: name = 'job_%i_%i' % (assigned_task.job, assigned_task.index) # Add spaces to output to align columns. - sol_line_tasks += '%10s' % name + sol_line_tasks += '%-10s' % name start = assigned_task.start duration = jobs_data[assigned_task.job][assigned_task.index][1] sol_tmp = '[%i,%i]' % (start, start + duration) # Add spaces to output to align columns. - sol_line += '%10s' % sol_tmp + sol_line += '%-10s' % sol_tmp sol_line += '\n' sol_line_tasks += '\n' + output += sol_line_tasks + output += sol_line # Finally print the solution found. - print('Optimal Schedule', '\n') - print(sol_line_tasks) - print('Task Time Intervals\n') - print(sol_line) + print('Optimal Schedule') + print(output) # [END solution_printing]