always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

polish output

Browse Source
This commit is contained in:
Laurent Perron
2018-12-30 12:03:43 +01:00
parent 65eb9e09c3
commit 844ecf5d91
2 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
examples/python/jobshop_with_maintenance_sat.py
View File

@@ -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__':

20
ortools/sat/samples/minimal_jobshop_sat.py
View File

@@ -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]