ddk_converter.py: add testing script for lab5

src/bitutils.py

@@ -75,3 +75,5 @@ def xor(x, y):
                 result += '0'
 
         return result
+    else:
+        pass

src/ddk_converter.py

@@ -0,0 +1,113 @@
+import bitutils as bu
+import math
+
+def to_int(x):
+    return int("0b" + x, 2)
+
+def to_bin(x, n):
+    return bu.ar(bin(x)[2:], n)
+
+def table_to_text(dt):
+    from lib.prettytable import PrettyTable
+    pt = PrettyTable()
+
+    initial_x_length = len(dt[0][0][-1])
+    final_row_length = len(dt[-1][-1])
+    pt.field_names = ["Iteration"] + [f"RG{i+1}" for i in range(final_row_length)]
+
+    for iteration, cycle in enumerate(dt):
+        for operation_id, row in enumerate(cycle):
+            complete_row = [iteration] + ['']*(final_row_length-len(row)) + row[:-1] + [bu.al(row[-1], initial_x_length)]
+            #print(complete_row)
+
+            if operation_id+1 == len(cycle):
+                pt.add_row(complete_row, divider = True)
+            else:
+                pt.add_row(complete_row)
+
+    return pt.get_string()
+
+def binary_to_ddk(k, x):
+    required_register_size = math.ceil(math.log(k, 2))
+    required_shift = to_bin(2**required_register_size - k, required_register_size)
+    
+    #print(f"math.log(k, 2): {math.log(k, 2)}")
+    #print(f"k: {k}, x: {x}")
+    #print(f"RRS: {required_register_size}, RS: {required_shift}")
+
+    # data table for logging registers
+    ddk_rg = ["0"*required_register_size]
+    device_states_log = []
+
+    x = str(x)
+
+    while len(x) != 0:
+        #print(f"Iter: DDK_RG: {ddk_rg}")
+        
+        # start new logging section
+        device_states_log.append([])
+
+        # increasing registers amount if required
+        if ddk_rg[0][0] == '1':
+            ddk_rg.insert(0, "0"*required_register_size)
+        
+        # reset force corrections
+        force_correction = [False]*len(ddk_rg)
+
+        device_states_log[-1].append(ddk_rg + [x]) # log
+
+        # shift left all registers
+        # iterating over registers from left to right
+        for i, rg in list(enumerate(ddk_rg))[:-1]:
+            force_correction[i+1] = bool(int(ddk_rg[i+1][0]))
+
+            ddk_rg[i] = bu.l(ddk_rg[i], ddk_rg[i+1][0])
+
+            #if do_correction:
+            #    ddk_rg[i+1] = bu.sum(ddk_rg[i+1], required_shift, required_register_size)
+
+        ddk_rg[-1] = bu.l(ddk_rg[-1], x[0])
+        x = bu.l(x, '')
+        
+        device_states_log[-1].append(ddk_rg + [x]) # log
+
+        # correct errors where needed
+        # iterating over registers from right to left
+        #print(ddk_rg)
+        for i, rg in list(enumerate(ddk_rg))[1:][::-1]:
+            #print(f"Correcting errors for: {rg} (i={i})")
+            if force_correction[i]:
+                ddk_rg[i] = bu.rsum(ddk_rg[i], required_shift, required_register_size)
+            if to_int(rg) >= k:
+                ddk_rg[i] = bu.rsum(ddk_rg[i], required_shift, required_register_size)
+                ddk_rg[i-1] = bu.rsum(ddk_rg[i-1], '1', required_register_size)
+
+        # special correction for first register
+        if to_int(ddk_rg[0]) >= k:
+            #print("Special correction triggered!")
+            ddk_rg[0] = bu.rsum(ddk_rg[0], required_shift, required_register_size)
+            ddk_rg.insert(0, "0"*(required_register_size-1) + '1')
+
+        device_states_log[-1].append(ddk_rg + [x]) # log
+    
+    formatted_result = ""
+
+    for i in ddk_rg:
+        digit = to_int(i)
+        if digit <= 9:
+            formatted_result += str(digit)
+        else:
+            formatted_result += chr(digit-10 + 65)
+
+    return device_states_log, ddk_rg, formatted_result
+
+
+if __name__ == "__main__":
+    x = input("Enter x: ")
+    k = int(input("Enter k: "))
+
+    dt, result, formatted_result = binary_to_ddk(k, x)
+
+    print(table_to_text(dt))
+    print(f"Result: {result}")
+    print(f"Formatted result: {formatted_result}")

src/divide-float.py

@@ -0,0 +1,129 @@
+# a wrapper for division script which adds support for floating point numbers
+
+from lib.prettytable import PrettyTable
+from divide import divide, table_to_text
+import bitutils as bu
+
+def get_reference_register_size(*numbers):
+    return max(map(len, numbers))
+
+def parse_float(number):
+    split_by_dot = number.split('.')
+    Sn = split_by_dot[0] # sign
+
+    split_by_comma = split_by_dot[1].split(',')
+    Pn = len(split_by_comma[0].lstrip('0'))
+    Mn = ''.join(split_by_comma).lstrip('0')
+
+    return Sn, Pn, Mn
+
+def to_int(number):
+    return int("0b" + number, 2)
+
+def normalize_mantice(m, n):
+    M_norm = m.lstrip('0')
+    P_delta = len(m) - len(M_norm)
+
+    print(f"Normalize: {m} -> {M_norm} (shifted right {P_delta} times)")
+
+    return M_norm[:n], P_delta
+
+def round_mantice(m, n):
+    closest_upper = bu.sum(m[:n+1], '1', n+1)
+    return closest_upper[:n]
+
+def print_classic_float(label, Sn, Pn, Mn):
+    pt = PrettyTable()
+    pt.field_names = [f"S{label}", f"P{label}", f"M{label}"]
+    pt.add_row([Sn, bin(Pn).lstrip('-')[2:], Mn])
+    print(pt)
+
+def print_shortened_float(label, Sn, Pn, Mn):
+    mutable_mantice = list(Mn)
+    P = Pn
+    while P < 0:
+        mutable_mantice.insert(0, '0')
+        P += 1
+    
+    if P > len(mutable_mantice):
+        for i in range(len(mutable_mantice), P+1):
+            mutable_mantice.insert(i, '0')
+    mutable_mantice.insert(P, ',')
+    result_string = ''.join(mutable_mantice)
+    print(f"{Sn}.{result_string}".replace(".,", ".0,"))
+
+def divide_float(x, y, method, n = 0, verbose = False):
+    Sx, Px, Mx = parse_float(x)
+    Sy, Py, My = parse_float(y)
+
+    print(f"Число X:\n" \
+          f"Знак мантиси: {Sx}\n" \
+          f"Порядок: {Px}\n" \
+          f"Мантиса: {Mx}\n")
+
+    print(f"Число Y:\n" \
+          f"Знак мантиси: {Sy}\n" \
+          f"Порядок: {Py}\n" \
+          f"Мантиса: {My}")
+
+    '''
+    while to_int(Mx) >= to_int(My):
+        print(f"Mx >= My ({Mx} >= {My}), тому зсуваємо Mx на один розряд праворуч і збільшуємо порядок числа X")
+        Mx = '0' + Mx
+        Px += 1
+    '''
+
+    Mx = Mx.rstrip("0")
+    My = My.rstrip("0")
+
+    print("Запис чисел у класичному форматі:")
+    print_classic_float('x', Sx, Px, Mx)
+    print()
+    print_classic_float('y', Sy, Py, My)
+    print()
+
+    #reg_size = get_reference_register_size(Mx, My)
+
+    while to_int(Mx) >= to_int(My):
+        print(f"Mx >= My ({Mx} >= {My}), тому зсуваємо Mx на один розряд праворуч і збільшуємо порядок числа X")
+        Mx = '0' + Mx
+        My = My + '0'
+        Px += 1
+
+    if n == 0:
+        reg_size = get_reference_register_size(Mx, My)
+        print(f"n = 0, отже довжина регістрів обирається автоматично ({reg_size})")
+    else:
+        reg_size = n
+
+    table, result = divide(reg_size, to_int(bu.al(Mx, reg_size)), to_int(bu.al(My, reg_size)), method)
+    print(f"Процес ділення методом #{method}:\n{table_to_text(table)}\n")
+
+    print("Маємо результат:")
+
+    S_result = bu.xor(Sx, Sy)
+    print(f"Знаковий розряд: {Sx} ⊕ {Sy} = {S_result}")
+
+    M_norm, P_delta = normalize_mantice(result, n+1)
+    print(f"Нормалізована мантиса: ,{M_norm}")
+
+    P_result = Px - Py - P_delta
+    print(f"Порядок: {Px} + {Py} - {P_delta} = {P_result}")
+
+    M_result = round_mantice(bu.al(result, n+1), n+1)
+    print(f"Округлюємо мантису до {reg_size} розрядів: ,{M_result}")
+
+    return S_result, P_result, M_result
+
+if __name__ == "__main__":
+    start_x = input("X: ")
+    start_y = input("Y: ")
+    n = int(input("n: "))
+    method = int(input("Method: "))
+
+    S_result, P_result, M_result = divide_float(start_x, start_y, method, n)
+
+    print(f"Запишемо результат у вигляді таблиці:")
+    print_classic_float('f', S_result, P_result, M_result)
+    print("І отримуємо остаточне число після ділення:")
+    print_shortened_float('F', S_result, P_result, M_result)

src/divide.py

@@ -3,16 +3,16 @@ import bitutils as bu
 def divide(n, int_x, int_y, method):
     if method == 1:
         # getting binary values
-        x = bu.ar(bin(int_x)[2:], n)
+        x = bu.ar(bin(int_x)[2:], n+2)
-        y = bu.ar(bin(int_y)[2:], n)
+        y = bu.ar(bin(int_y)[2:], n+2)
 
         # getting the supplementary code of X
         y_inv = "".join([bu.inv(i) for i in y]) # invert
-        y_inv = bu.sum(y_inv, '1', n) # +1
+        y_inv = bu.sum(y_inv, '1', n+2) # +1
 
         # writing startup register values
         # registers order: RG3, RG2, RG1
-        rg_table = [[['start', '1'*(n-1), x, y, '-'], ['start', '1'*(n-1), x, y_inv, '-']]]
+        rg_table = [[['start', '1'*(n+1), x, y, '-'], ['start', '1'*(n+1), x, y_inv, '-']]]
 
         # iterations counter
         i = 0
@@ -25,7 +25,7 @@ def divide(n, int_x, int_y, method):
                 rg_table[-1].append([
                     i,
                     rg_table[-2][-1][1], # copy previous value
-                    bu.sum(rg_table[-2][-1][2], rg_table[0][0][3], n), # RG2 := RG2 + RG1
+                    bu.sum(rg_table[-2][-1][2], rg_table[0][0][3], n+2), # RG2 := RG2 + RG1
                     '-',
                     "RG2 := RG2 + RG1"
                 ])
@@ -33,7 +33,7 @@ def divide(n, int_x, int_y, method):
                 rg_table[-1].append([
                     i,
                     rg_table[-2][-1][1], # copy previous value
-                    bu.sum(rg_table[-2][-1][2], rg_table[0][1][3], n), # RG2 := RG2 - RG1
+                    bu.sum(rg_table[-2][-1][2], rg_table[0][1][3], n+2), # RG2 := RG2 - RG1
                     '-',
                     "RG2 := RG2 - RG1"
                 ])
@@ -104,11 +104,29 @@ def divide(n, int_x, int_y, method):
         return rg_table, rg_table[-1][-1][1][1:]
 
 
+def table_to_text(dt):
+    from lib.prettytable import PrettyTable
+    pt = PrettyTable()
+    pt.field_names = ["Iteration", "RG3", "RG2", "RG1", "Operations"]
+
+    for i in dt:
+        for j in range(len(i)):
+            if j+1 == len(i):
+                pt.add_row(i[j], divider = True)
+            else:
+                pt.add_row(i[j])
+
+    return pt.get_string()
+
 if __name__ == "__main__":
     # a fully functional reference
     # implementation for this library
     # is provided below
 
+    # usage change of method #1
+    print("УВАГА! Для першого методу додавати два нулі перед числом БІЛЬШЕ НЕ ПОТРІБНО!\n"
+          "(це попередження буде прибрано у майбутніх версіях, вводьте числа уважно)")
+
     raw_x = input("X: ")
     raw_y = input("Y: ")
 
@@ -124,16 +142,5 @@ if __name__ == "__main__":
 
     dt, result = divide(n, x, y, method)
 
-    from lib.prettytable import PrettyTable
+    print(table_to_text(dt))
-    pt = PrettyTable()
-    pt.field_names = ["Iteration", "RG3", "RG2", "RG1", "Operations"]
-
-    for i in dt:
-        for j in range(len(i)):
-            if j+1 == len(i):
-                pt.add_row(i[j], divider = True)
-            else:
-                pt.add_row(i[j])
-
-    print(pt)
     print(f"Result: {result}")

src/multiply-float.py

@@ -0,0 +1,92 @@
+# a wrapper for multiplication script which adds support for floating point numbers
+
+from lib.prettytable import PrettyTable
+from multiply import multiply, table_to_text
+import bitutils as bu
+
+def get_reference_register_size(*numbers):
+    return max(map(len, numbers))
+
+def parse_float(number):
+    split_by_dot = number.split('.')
+    #print(number, split_by_dot)
+    Sn = split_by_dot[0] # sign
+
+    split_by_comma = split_by_dot[1].split(',')
+    Pn = len(split_by_comma[0].lstrip('0'))
+    Mn = ''.join(split_by_comma).lstrip('0')
+    #print(Sn, Pn, Mn)
+    return Sn, Pn, Mn
+
+# compatibility layer for old multiply.py code
+def to_int(number):
+    return int("0b" + number, 2)
+
+def normalize_mantice(m, n):
+    M_norm = m.lstrip('0')
+    #print(m, M_norm)
+    P_delta = len(m) - len(M_norm)
+    #print(M_norm[:n], P_delta)
+    return M_norm[:n], P_delta
+
+def round_mantice(m, n):
+    closest_upper = bu.sum(m[:n+1], '1', n+1)
+    return closest_upper[:n]
+
+def print_classic_float(label, Sn, Pn, Mn):
+    pt = PrettyTable()
+    pt.field_names = [f"S{label}", f"P{label}", f"M{label}"]
+    pt.add_row([Sn, bin(Pn)[2:], Mn])
+    print(pt)
+
+def multiply_float(x, y, method, n = 0, verbose = False):
+    Sx, Px, Mx = parse_float(x)
+    Sy, Py, My = parse_float(y)
+
+    print(f"Число X:\n" \
+          f"Знак мантиси: {Sx}\n" \
+          f"Порядок: {Px}\n" \
+          f"Мантиса: {Mx}\n")
+
+    print(f"Число Y:\n" \
+          f"Знак мантиси: {Sy}\n" \
+          f"Порядок: {Py}\n" \
+          f"Мантиса: {My}")
+
+    print("Запис чисел у класичному форматі:")
+    print_classic_float('x', Sx, Px, Mx)
+    print()
+    print_classic_float('y', Sy, Py, My)
+    print()
+
+    reg_size = get_reference_register_size(Mx, My)
+
+    table, result = multiply(n, to_int(bu.al(Mx, n)), to_int(bu.al(My, n)), method)
+    print(f"Процес множення другим методом:\n{table_to_text(table)}\n")
+
+    print("Маємо результат:")
+
+    S_result = bu.xor(Sx, Sy)
+    print(f"Знаковий розряд: {Sx} ^ {Sy} = {S_result}")
+
+    M_norm, P_delta = normalize_mantice(result, n+1)
+    print(f"Нормалізована мантиса: ,{M_norm}")
+
+    P_result = Px + Py - P_delta
+    print(f"Порядок: {Px} + {Py} - {P_delta} = {P_result}")
+
+    M_result = round_mantice(result, n)
+    print(f"Округлюємо мантису до {n} розрядів: ,{M_result}")
+
+    return S_result, P_result, M_result
+
+if __name__ == "__main__":
+    start_x = input("X: ")
+    start_y = input("Y: ")
+    n = int(input("n: "))
+    method = int(input("Method: "))
+
+    S_result, P_result, M_result = multiply_float(start_x, start_y, method, n)
+
+    print(f"Запишемо результат у вигляді таблиці:")
+    print_classic_float('f', S_result, P_result, M_result)

src/www/bitutils.py

@@ -0,0 +1 @@
+../bitutils.py

src/www/ddk_converter.py

@@ -0,0 +1 @@
+../ddk_converter.py

src/www/divide.py

@@ -0,0 +1 @@
+../divide.py

src/www/lib

@@ -0,0 +1 @@
+../lib/

src/www/multiply.py

@@ -0,0 +1 @@
+../multiply.py

src/www/web-ddk-converter.py

@@ -0,0 +1,27 @@
+import os
+import sys
+
+from ddk_converter import binary_to_ddk, table_to_text
+
+print(os.environ, file = sys.stderr)
+
+raw_params = list(map(lambda x: x.split("="), os.environ['QUERY_STRING'].split("&")))
+baked_params = {k:v for (k, v) in raw_params}
+bp = baked_params
+
+if all([i in bp for i in ('x', 'k', 'op')]):
+    x = bp['x']
+    k = int(bp['k'])
+
+    if bp['op'] == "binary-ddk":
+        dt, result, formatted_result = binary_to_ddk(k, x)
+
+        print(f"Content-Type: text/plain; charset=UTF-8\n"
+              f"\n"
+              f"{table_to_text(dt)}\n"
+              f"Result: {result}\n"
+              f"Formatted result: {formatted_result}")
+    else:
+        print("Content-Type: text/plain; charset=UTF-8\r\n\r\nThis operation is not supported yet")
+else:
+    print("Content-Type: text/plain; charset=UTF-8\r\n\r\nCheck your input!")

src/www/web-divide.py

@@ -0,0 +1,23 @@
+import os
+import sys
+
+from divide import divide, table_to_text
+
+print(os.environ, file = sys.stderr)
+
+raw_params = list(map(lambda x: x.split("="), os.environ['QUERY_STRING'].split("&")))
+baked_params = {k:v for (k, v) in raw_params}
+bp = baked_params
+
+if "x" in bp and "y" in bp and "m" in bp:
+    x = int("0b" + bp['x'], 2)
+    y = int("0b" + bp['y'], 2)
+    m = int(bp['m'])
+    dt, result = divide(max(list(map(len, [bp['x'], bp['y']]))), x, y, m)
+
+    print(f"Content-Type: text/plain; charset=UTF-8\r\n"
+          f"\r\n"
+          f"{table_to_text(dt)}\r\n"
+          f"Result: {result}")
+else:
+    print("Content-Type: text/plain; charset=UTF-8\r\n\r\nCheck your input!")

src/www/web-multiply.py

@@ -0,0 +1,23 @@
+import os
+import sys
+
+from multiply import multiply, table_to_text
+
+print(os.environ, file = sys.stderr)
+
+raw_params = list(map(lambda x: x.split("="), os.environ['QUERY_STRING'].split("&")))
+baked_params = {k:v for (k, v) in raw_params}
+bp = baked_params
+
+if "x" in bp and "y" in bp and "m" in bp:
+    x = int("0b" + bp['x'], 2)
+    y = int("0b" + bp['y'], 2)
+    m = int(bp['m'])
+    dt, result = multiply(max(list(map(len, [bp['x'], bp['y']]))), x, y, m)
+
+    print(f"Content-Type: text/plain; charset=UTF-8\r\n"
+          f"\r\n"
+          f"{table_to_text(dt)}\r\n"
+          f"Result: {result}")
+else:
+    print("Content-Type: text/plain; charset=UTF-8\r\n\r\nCheck your input!")