mid commit

Author: RenanSouza2

lib/big/code.c

@@ -12,8 +12,6 @@
 #include "../../mods/number/lib/num/struct.h"
 #include "../../mods/number/header.h"
 
-#include "../split/header.h"
-
 
 
 #ifdef DEBUG
@@ -28,7 +26,7 @@
 
 
 
-void triplet_join(
+void binary_split_join(
     sig_num_t out[3],
     sig_num_t res_1[3],
     sig_num_t res_2[3]
@@ -47,7 +45,7 @@ void triplet_join(
 }
 
 // out vector length 3, returns P, Q, R in that order
-void triplet_calculate(sig_num_t out[3], uint64_t i_0, uint64_t span)
+void binary_split(sig_num_t out[3], uint64_t i_0, uint64_t span)
 {
     if(span == 0)
     {
@@ -63,44 +61,44 @@ void triplet_calculate(sig_num_t out[3], uint64_t i_0, uint64_t span)
     }
 
     sig_num_t res_1[3], res_2[3];
-    triplet_calculate(res_1, i_0              , span - 1);
-    triplet_calculate(res_2, i_0 + B(span - 1), span - 1);
+    split(res_1, i_0              , span - 1);
+    split(res_2, i_0 + B(span - 1), span - 1);
     triplet_join(out, res_1, res_2);
 }
 
 
 
-void triplet_path_set(char path[PATH_MAX_LEN], uint64_t i_0, uint64_t span)
+void piece_path_set(char path[PATH_MAX_LEN], uint64_t i_0, uint64_t span)
 {
     uint64_t i_max = i_0 + B(span) - 1;
     span = span - PIECE_SIZE;
-    snprintf(path, PATH_MAX_LEN, CACHE "/triplet/p_" U64P(015) "_" U64P(02) "_" U64P(015) ".bin", i_0, span, i_max);
+    snprintf(path, PATH_MAX_LEN, CACHE "/piece/p_" U64P(015) "_" U64P(02) "_" U64P(015) ".bin", i_0, span, i_max);
 }
 
-void triplet_delete(uint64_t i_0, uint64_t span)
+void piece_delete(uint64_t i_0, uint64_t span)
 {
     char path[PATH_MAX_LEN];
-    triplet_path_set(path, i_0, span);
+    piece_path_set(path, i_0, span);
     remove(path);
 }
 
-FILE* triplet_try_open_read(uint64_t i_0, uint64_t span)
+FILE* piece_try_open_read(uint64_t i_0, uint64_t span)
 {
     char path[PATH_MAX_LEN];
-    triplet_path_set(path, i_0, span);
+    piece_path_set(path, i_0, span);
     return file_read_open(path);
 }
 
-file_t triplet_open_write(uint64_t i_0, uint64_t span)
+file_t piece_open_write(uint64_t i_0, uint64_t span)
 {
     char path[PATH_MAX_LEN];
-    triplet_path_set(path, i_0, span);
+    piece_path_set(path, i_0, span);
     return file_write_open(path, 3);
 }
 
-void triplet_save(sig_num_t res[3], uint64_t i_0, uint64_t span)
+void piece_save(sig_num_t res[3], uint64_t i_0, uint64_t span)
 {
-    file_t fp = triplet_open_write(i_0, span);
+    file_t fp = piece_open_write(i_0, span);
     for(uint64_t i=0; i<3; i++)
     {
         file_write_sig_num(&fp, res[i]);
@@ -110,9 +108,9 @@ void triplet_save(sig_num_t res[3], uint64_t i_0, uint64_t span)
     file_write_close(&fp);
 }
 
-bool triplet_try_load(sig_num_p out, uint64_t i_0, uint64_t span, uint64_t index)
+bool piece_try_load(sig_num_p out, uint64_t i_0, uint64_t span, uint64_t index)
 {
-    FILE *fp = triplet_try_open_read(i_0, span);
+    FILE *fp = piece_try_open_read(i_0, span);
     if(fp == NULL)
         return false;
 
@@ -121,16 +119,16 @@ bool triplet_try_load(sig_num_p out, uint64_t i_0, uint64_t span, uint64_t index
     return true;
 }
 
-sig_num_t triplet_load(uint64_t i_0, uint64_t span, uint64_t index)
+sig_num_t piece_load(uint64_t i_0, uint64_t span, uint64_t index)
 {
     sig_num_t res;
-    assert(triplet_try_load(&res, i_0, span, index));
+    assert(piece_try_load(&res, i_0, span, index));
     return res;
 }
 
-bool triplet_is_stored(uint64_t i_0, uint64_t span)
+bool piece_is_stored(uint64_t i_0, uint64_t span)
 {
-    FILE *fp = triplet_try_open_read(i_0, span);
+    FILE *fp = piece_try_open_read(i_0, span);
     if(fp == NULL)
         return false;
 
@@ -139,7 +137,7 @@ bool triplet_is_stored(uint64_t i_0, uint64_t span)
 }
 
 // Get the size of the first number
-uint64_t triplet_get_size(uint64_t i_0, uint64_t span, uint64_t index)
+uint64_t piece_get_size(uint64_t i_0, uint64_t span, uint64_t index)
 {
     FILE *fp = triplet_try_open_read(i_0, span);
     assert(fp);
@@ -187,22 +185,6 @@ file_t slice_open_write(uint64_t size, uint64_t i_0, uint64_t remainder, uint64_
     return file_write_open(path, 1);
 }
 
-union_num_t slice_load(
-    uint64_t size,
-    uint64_t i_0,
-    uint64_t remainder,
-    uint64_t depth,
-    uint64_t index
-)
-{
-    FILE *fp = slice_try_open_read(size, i_0, remainder, depth);
-    assert(fp);
-
-    union_num_t u = file_read_union_num(fp, index);
-    fclose(fp);
-    return u;
-}
-
 bool slice_is_stored(uint64_t size, uint64_t i_0, uint64_t remainder, uint64_t depth)
 {
     FILE *fp = slice_try_open_read(size, i_0, remainder, depth);
@@ -323,23 +305,6 @@ void split_span(uint64_t size, uint64_t i_0, uint64_t span, uint64_t depth)
 
 
 
-union_num_t split_big_res_load(
-    uint64_t size,
-    uint64_t i_0,
-    uint64_t remainder,
-    uint64_t depth,
-    uint64_t index
-)
-{
-    if(stdc_count_ones(remainder) == 1)
-    {
-        uint64_t span = stdc_bit_width(remainder) - 1;
-        return split_span_res_load(size, i_0, span, depth, index);
-    }
-
-    return union_res_load(size, i_0, remainder, depth, index);
-}
-
 bool split_big_res_is_stored(
     uint64_t size,
     uint64_t i_0,