more simplifications

parent d7d2915c
......@@ -52,8 +52,6 @@ std::vector<Polynomial> F4() {
std::sort(global_critical_pairs.begin(), global_critical_pairs.end());
unsigned step_number = 1;
std::vector<PolynomialInMatrix> new_reduced_polynomials1;
std::vector<PolynomialInMatrix> new_reduced_polynomials2;
std::vector<PolynomialInMatrix> new_polynomials_in_gb;
std::set<Monomial> GB_LeadingMonomials;
......@@ -75,9 +73,6 @@ std::vector<Polynomial> F4() {
std::system(("build/selred/selred " + WORKDIR + " critpairs_step.txt reductors_step.txt "
+ list_id_reductors).c_str());
// std::vector<std::pair<Monomial, PolynomialInMatrix>> step_reductors;
// LoadReductors("reductors_step.txt", step_reductors, UniqueMatIds);
std::system(("build/buildmats/buildmats " + WORKDIR + " critpairs_step.txt reductors_step.txt " +
"matA matB matC matD").c_str());
......@@ -99,28 +94,13 @@ std::vector<Polynomial> F4() {
p_current_storage_matrix1->Store("matrices/" + p_current_storage_matrix1->id() + ".mat");
new_reduced_polynomials1 =
PolynomialInMatrix::MakeSystemOfPolynomialsInMatrix(p_current_storage_matrix1);
global_reductors.insert(global_reductors.begin(),
new_reduced_polynomials1.begin(),
new_reduced_polynomials1.end());
auto p_current_storage_matrix2 = std::make_shared<const StorageMatrix>(D, D->col_dec_, D->row_dec_);
p_current_storage_matrix2->Store("matrices/" + p_current_storage_matrix2->id() + ".mat");
new_reduced_polynomials2 =
PolynomialInMatrix::MakeSystemOfPolynomialsInMatrix(p_current_storage_matrix2);
list_id_reductors += p_current_storage_matrix1->id() + " ";
list_id_reductors += p_current_storage_matrix2->id() + " ";
new_reduced_polynomials1.clear();
new_reduced_polynomials1.shrink_to_fit();
new_reduced_polynomials2.clear();
new_reduced_polynomials2.shrink_to_fit();
TINYGB_TRY(SaveGB("gb.txt", gb), "f4");
std::system(("build/addcrit/addcrit " + WORKDIR + " " + p_current_storage_matrix2->id()
......
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