From f76284fcaaaa2874bb7bebad38299fdfd88aaebc Mon Sep 17 00:00:00 2001 From: honzastor Date: Thu, 4 Mar 2021 19:34:08 +0100 Subject: [PATCH] Updated cgp chromosomes for 1 bit multipliers. --- Tests/CGP_circuits/Multipliers/s_arr_mul1.chr | 2 +- Tests/CGP_circuits/Multipliers/u_arr_mul1.chr | 2 +- arithmetic_circuits_generator.py | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Tests/CGP_circuits/Multipliers/s_arr_mul1.chr b/Tests/CGP_circuits/Multipliers/s_arr_mul1.chr index a6d94d2..b141c9e 100644 --- a/Tests/CGP_circuits/Multipliers/s_arr_mul1.chr +++ b/Tests/CGP_circuits/Multipliers/s_arr_mul1.chr @@ -1 +1 @@ -{1,4,2,1,0}(0,1,4)(0,1,7)(2,3,3)(0,1,2)(5) \ No newline at end of file +{1,5,2,1,0}(0,1,4)(0,1,7)(2,3,3)(0,1,2)(4,5,6)(6,5) \ No newline at end of file diff --git a/Tests/CGP_circuits/Multipliers/u_arr_mul1.chr b/Tests/CGP_circuits/Multipliers/u_arr_mul1.chr index 85441c4..2b48ba6 100644 --- a/Tests/CGP_circuits/Multipliers/u_arr_mul1.chr +++ b/Tests/CGP_circuits/Multipliers/u_arr_mul1.chr @@ -1 +1 @@ -{1,1,2,1,0}(0,1,2)(2) \ No newline at end of file +{1,4,2,1,0}(0,1,2)(0,1,4)(0,1,7)(3,4,2)(5,2) \ No newline at end of file diff --git a/arithmetic_circuits_generator.py b/arithmetic_circuits_generator.py index 89053a5..de0df17 100644 --- a/arithmetic_circuits_generator.py +++ b/arithmetic_circuits_generator.py @@ -7,19 +7,19 @@ import sys """ TESTING """ if __name__ == "__main__": - a = bus(N=10, prefix="a") + a = bus(N=1, prefix="a") b = bus(N=1, prefix="b") rca = unsigned_ripple_carry_adder(a, b, prefix="h_u_rca8") # rca.get_v_code_hier(open("h_u_rca8.v", "w")) # rca.get_c_code_hier(open("h_u_rca8.c", "w")) - arrmul = unsigned_array_multiplier(a, b, prefix="f_u_arr_mul10") - arrmul.get_c_code_flat(open("f_u_arr_mul10.c", "w")) - arrmul.get_v_code_flat(open("f_u_arr_mul10.v", "w")) - - # arrmul.get_cgp_code_hier(open("s_arr_mul5.chr", "w")) - # rca.get_cgp_code_hier(open("s_rca5.chr", "w")) + arrmul = signed_array_multiplier(a, b, prefix="f_u_arr_mul1") + # arrmul.get_c_code_flat(open("f_u_arr_mul10.c", "w")) + # arrmul.get_v_code_flat(open("f_u_arr_mul10.v", "w")) + arrmul.get_cgp_code(open("s_arr_mul1.chr", "w")) + # arrmul.get_cgp_code(open("s_arr_mul5.chr", "w")) + # rca.get_cgp_code(open("s_rca5.chr", "w")) w1 = wire(name="a") w2 = wire(name="b")