Skip to content

Commit

Permalink
bad fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
glebskix committed Nov 10, 2019
1 parent 07b4fc7 commit 03fcddc
Showing 1 changed file with 21 additions and 22 deletions.
43 changes: 21 additions & 22 deletions solvers.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ def __actual_translate__(self, input_number, from_num_sys, to_num_sys):
print()
mods.append(letter)
number = div
if len(mods) == 0:
mods = [0]

reversed_mods = mods[::-1]
str_reversed_mods = [str(item) for item in reversed_mods]
Expand All @@ -106,27 +108,36 @@ def __actual_translate__(self, input_number, from_num_sys, to_num_sys):

number_split = str(number).split('.')
temp_whole = number_split[0]
temp_whole_letter = AbstractTranslator.digit_to_letter(int(temp_whole))
remainder = number_split[1]
self.beauty_print(temp_whole, remainder, to_num_sys)
wholes.append(temp_whole)
wholes.append(temp_whole_letter)
if remainder == '0':
break
number = float(f'0.{remainder}')

str_result = ''.join(wholes)
float_result = float(f'0.{str_result}')
format_result = '{:.5f}'.format(float_result)
float_result = f'0.{str_result}'
# format_result = '{:.5f}'.format(float_result)

return format_result
return float_result
# return format_result

@staticmethod
def beauty_print(temp_whole, remainder, to_num_sys, hide=False):
if hide:
temp_whole_letter = AbstractTranslator.digit_to_letter(int(temp_whole))
if hide or temp_whole != temp_whole_letter:
temp_whole = f'({temp_whole})'
whole_part = '{:^{}s}|'.format(temp_whole, 3)
whole_and_reminder = '{} {:{}s}'.format(whole_part, remainder, 2)
whole_part = '{:^{}s}|'.format(temp_whole, 4)
whole_and_reminder = '{} {:{}s}'.format(whole_part, remainder, 3)

whole_part_letter = '{:>{}}'.format('|', len(whole_part))
if temp_whole != temp_whole_letter:
whole_part_letter = '{:^{}s}|'.format(temp_whole_letter, 4)
whole_and_reminder_letter = '{} {}'.format(whole_part_letter, to_num_sys)

print(whole_and_reminder)
print('{:>{}} {}'.format('|', len(whole_part), to_num_sys))
print(whole_and_reminder_letter)
print('—' * len(whole_and_reminder))


Expand Down Expand Up @@ -440,18 +451,6 @@ def get_translators() -> Dict[int, AbstractTranslator]:
return translators


def temp_f():
# translator = FromDecimalToAny()
#
# for number in [121, 13, 10, 2018, 5]:
# answer = translator.translate(number, 10, 2)
# print()

translator = FromAnyToDecimal()
for number in [15, 532, 123, 58]:
translator.translate(number, -10, 10)
print()


if __name__ == '__main__':
temp_f()
translator = FromDecimalToAny()
translator.translate('0,0025', 10, 16)

0 comments on commit 03fcddc

Please sign in to comment.