diff --git a/resources/simplex/simplex.py b/resources/simplex/simplex.py index 1de39781bbce914aa1124a321367d009b683e52e..dc91d7f60d5fe40efa1e0b76a06dca04279cfafb 100644 --- a/resources/simplex/simplex.py +++ b/resources/simplex/simplex.py @@ -345,7 +345,7 @@ class Simplex(): logger.info('') # Calculate overall table width. - tableau_length = (len(self._obj_func) * 5) + 4 + tableau_length = (len(self._obj_func) * 6) + 4 # Optionally print description. if self._description is not None: @@ -360,7 +360,7 @@ class Simplex(): if index == (len(self._obj_func) - 1): print_string += ' C ' else: - print_string += ' {0:>3} '.format('x{0}'.format(index + 1)) + print_string += ' {0:>4} '.format('x{0}'.format(index + 1)) print_string += ' B' logger.info(print_string) @@ -371,9 +371,9 @@ class Simplex(): for index in range(len(self._obj_func)): # Check if last index. if index == (len(self._obj_func) - 1): - print_string += ' | {0:>3} |'.format(self._obj_func[index]) + print_string += ' | {0:>4} |'.format(self._obj_func[index]) else: - print_string += ' {0:>3} '.format(self._obj_func[index]) + print_string += ' {0:>4} '.format(self._obj_func[index]) logger.info(print_string) # Print constraints. @@ -386,9 +386,9 @@ class Simplex(): # Loop through all items in row. for item in self._matrix_a[row_index]: - print_string += ' {0:>3} '.format(item) - print_string += ' | {0:>3} |'.format(self._constants[row_index]) - print_string += ' {0:>3}'.format('x{0}'.format(self._basic_var_indexes[row_index] + 1)) + print_string += ' {0:>4} '.format(item) + print_string += ' | {0:>4} |'.format(self._constants[row_index]) + print_string += ' {0:>4}'.format('x{0}'.format(self._basic_var_indexes[row_index] + 1)) logger.info(print_string) logger.info(' ' + '-' * tableau_length)