more simplifications

parent 3f54f9bf
......@@ -30,7 +30,6 @@ namespace tinygb {
std::vector<Polynomial> F4() {
std::vector<PolynomialInMatrix> gb;
std::vector<CriticalPair> global_critical_pairs;
std::vector<CriticalPair> step_critical_pairs;
std::vector<PolynomialInMatrix> global_reductors;
std::string input_sys{"interreduced_system"};
......@@ -52,8 +51,6 @@ std::vector<Polynomial> F4() {
std::sort(global_critical_pairs.begin(), global_critical_pairs.end());
unsigned step_number = 1;
std::vector<PolynomialInMatrix> new_polynomials_in_gb;
std::set<Monomial> GB_LeadingMonomials;
for (const auto& g : gb)
GB_LeadingMonomials.insert(g.LeadingMonomial());
......@@ -69,18 +66,12 @@ std::vector<Polynomial> F4() {
TINYGB_TRY(SaveCritPairs("critpairs_glob.txt", global_critical_pairs), "f4");
std::system(("build/selcrit/selcrit " + WORKDIR + " critpairs_glob.txt critpairs_step.txt").c_str());
std::system(("build/selred/selred " + WORKDIR + " critpairs_step.txt reductors_step.txt "
+ list_id_reductors).c_str());
std::system(("build/buildmats/buildmats " + WORKDIR + " critpairs_step.txt reductors_step.txt " +
"matA matB matC matD").c_str());
std::system(("build/utsolve/utsolve " + WORKDIR + " matB2 matA matB").c_str());
std::system(("build/matmulsub/matmulsub " + WORKDIR + " matR matB2 matC matD").c_str());
step_critical_pairs.clear();
std::system(("build/rowech/rowech " + WORKDIR + " matD2 matB3 matR matB2").c_str());
std::shared_ptr<RowMajMat> B, D;
......@@ -88,8 +79,6 @@ std::vector<Polynomial> F4() {
TINYGB_TRY(ReadRowMajMat(&D, "matD2"), "f4");
TINYGB_TRY(ReadRowMajMat(&B, "matB3"), "f4");
new_polynomials_in_gb.clear();
auto p_current_storage_matrix1 = std::make_shared<const StorageMatrix>(B, B->col_dec_, B->row_dec_);
p_current_storage_matrix1->Store("matrices/" + p_current_storage_matrix1->id() + ".mat");
......@@ -110,8 +99,6 @@ std::vector<Polynomial> F4() {
TINYGB_TRY(LoadCritPairs("critpairs_glob.txt", global_critical_pairs, UniqueMatIds), "f4");
std::sort(global_critical_pairs.begin(), global_critical_pairs.end());
new_polynomials_in_gb.clear();
new_polynomials_in_gb.shrink_to_fit();
step_number++;
GB_LeadingMonomials.clear();
for (const auto& g : gb)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment