More renames

cli/spiff/CMakeLists.txt

@@ -36,7 +36,7 @@ target_include_directories(${PROJECT_NAME}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../src/intmath
     ${CMAKE_CURRENT_SOURCE_DIR}/../../src/polynomials
     ${CMAKE_CURRENT_SOURCE_DIR}/../../src/rationals
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../src/qcyclo
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../src/q_cyclo
     ${CMAKE_CURRENT_SOURCE_DIR}/../../src/random
     ${CMAKE_CURRENT_SOURCE_DIR}/../../src/factorization
     ${CMAKE_CURRENT_SOURCE_DIR}/../../src/units
@@ -52,7 +52,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
     intmath
     polynomials
     rationals
-    qcyclo
+    q_cyclo
     random
     factorization
     units

cli/spiff/README.md

@@ -21,7 +21,7 @@ spffl::rationals::f2n_polyrat_t   f2npr   F_{2^n}(y)               Quotient fiel
 //
 spffl::polynomials::fpn_poly_t      fpnp    F_{p^n}[y]               Ring
 spffl::polynomials::fpn_polymod_t   fpnpm   F_{p^n}[y]/<g(y)>        Residue field
-fpnpolyrat_t   fpnpr   F_{p^n}(y)               Quotient field
+fpn_polyrat_t   fpnpr   F_{p^n}(y)               Quotient field
 
 ----------------------------------------------------------------
 Rings:

cli/spiff/f2_handlers.cpp

@@ -7,18 +7,18 @@
 #include "int_random.h"
 #include "tmatrix.h"
 
-int f2op_main(int argc, char **argv, usage_t *pusage) {
+int f2_op_main(int argc, char **argv, usage_t *pusage) {
   spffl::cliparser::cmd_line_parse<spffl::bits::bit_t>(
       argc - 1, argv + 1, spffl::bits::bit_t(0), spffl::bits::bit_t(1));
   return 0;
 }
 
-void f2random_usage(char *argv0) {
+void f2_random_usage(char *argv0) {
   std::cerr << "Usage: " << argv0 << " [count]\n";
   exit(1);
 }
 
-int f2random_main(int argc, char **argv, usage_t *pusage) {
+int f2_random_main(int argc, char **argv, usage_t *pusage) {
   int count = 1;
 
   if ((argc != 1) && (argc != 2))
@@ -34,24 +34,24 @@ int f2random_main(int argc, char **argv, usage_t *pusage) {
   return 0;
 }
 
-int f2matop_main(int argc, char **argv, usage_t *pusage) {
+int f2_mat_op_main(int argc, char **argv, usage_t *pusage) {
   spffl::cliparser::cmd_line_mat_parse<spffl::bits::bit_t>(
       argc - 1, argv + 1, spffl::bits::bit_t(0), spffl::bits::bit_t(1));
   return 0;
 }
 
-int f2vecop_main(int argc, char **argv, usage_t *pusage) {
+int f2_vec_op_main(int argc, char **argv, usage_t *pusage) {
   spffl::cliparser::cmd_line_vec_parse<spffl::bits::bit_t>(
       argc - 1, argv + 1, spffl::bits::bit_t(0), spffl::bits::bit_t(1));
   return 0;
 }
 
-void f2matchpol_usage(char *argv0) {
+void f2_mat_ch_pol_usage(char *argv0) {
   std::cerr << "Usage: " << argv0 << " {goes here}\n";
   exit(1);
 }
 
-int f2matchpol_main(int argc, char **argv, usage_t *pusage) {
+int f2_mat_ch_pol_main(int argc, char **argv, usage_t *pusage) {
   tmatrix<spffl::bits::bit_t> A;
 
   if (argc != 2)
@@ -65,12 +65,12 @@ int f2matchpol_main(int argc, char **argv, usage_t *pusage) {
   return 0;
 }
 
-void f2matord_usage(char *argv0) {
+void f2_mat_ord_usage(char *argv0) {
   std::cerr << "Usage: " << argv0 << " {goes here}\n";
   exit(1);
 }
 
-int f2matord_main(int argc, char **argv, usage_t *pusage) {
+int f2_mat_ord_main(int argc, char **argv, usage_t *pusage) {
   tmatrix<spffl::bits::bit_t> A;
 
   if (argc != 1)
@@ -104,12 +104,12 @@ int f2matord_main(int argc, char **argv, usage_t *pusage) {
   return 0;
 }
 
-void f2matrandom_usage(char *argv0) {
+void f2_mat_random_usage(char *argv0) {
   std::cerr << "Usage: " << argv0 << " {# rows} {# cols}\n";
   exit(1);
 }
 
-int f2matrandom_main(int argc, char **argv, usage_t *pusage) {
+int f2_mat_random_main(int argc, char **argv, usage_t *pusage) {
   int nr, nc;
 
   if (argc != 3)

cli/spiff/f2_handlers.h

@@ -3,22 +3,22 @@
 
 #include "handlers.h"
 
-int f2op_main(int argc, char **argv, usage_t *pusage);
+int f2_op_main(int argc, char **argv, usage_t *pusage);
 
-void f2random_usage(char *argv0);
-int f2random_main(int argc, char **argv, usage_t *pusage);
+void f2_random_usage(char *argv0);
+int f2_random_main(int argc, char **argv, usage_t *pusage);
 
-int f2matop_main(int argc, char **argv, usage_t *pusage);
+int f2_mat_op_main(int argc, char **argv, usage_t *pusage);
 
-int f2vecop_main(int argc, char **argv, usage_t *pusage);
+int f2_vec_op_main(int argc, char **argv, usage_t *pusage);
 
-void f2matchpol_usage(char *argv0);
-int f2matchpol_main(int argc, char **argv, usage_t *pusage);
+void f2_mat_ch_pol_usage(char *argv0);
+int f2_mat_ch_pol_main(int argc, char **argv, usage_t *pusage);
 
-void f2matord_usage(char *argv0);
-int f2matord_main(int argc, char **argv, usage_t *pusage);
+void f2_mat_ord_usage(char *argv0);
+int f2_mat_ord_main(int argc, char **argv, usage_t *pusage);
 
-void f2matrandom_usage(char *argv0);
-int f2matrandom_main(int argc, char **argv, usage_t *pusage);
+void f2_mat_random_usage(char *argv0);
+int f2_mat_random_main(int argc, char **argv, usage_t *pusage);
 
 #endif // F2_HANDLERS_H