more simplifications

parent 61bac282
......@@ -30,7 +30,6 @@ namespace tinygb {
std::vector<Polynomial> F4() {
std::vector<PolynomialInMatrix> gb;
std::vector<CriticalPair> global_critical_pairs;
std::vector<PolynomialInMatrix> global_reductors;
std::string input_sys{"interreduced_system"};
std::map<std::string, std::shared_ptr<StorageMatrix>> UniqueMatIds;
......@@ -45,10 +44,6 @@ std::vector<Polynomial> F4() {
TINYGB_TRY(LoadCritPairs("critpairs_glob.txt", global_critical_pairs, UniqueMatIds), "f4");
TINYGB_TRY(LoadGB("gb.txt", gb, UniqueMatIds), "f4");
for (const auto& it : gb)
global_reductors.push_back(it);
std::sort(global_critical_pairs.begin(), global_critical_pairs.end());
unsigned step_number = 1;
std::set<Monomial> GB_LeadingMonomials;
......@@ -80,11 +75,9 @@ std::vector<Polynomial> F4() {
TINYGB_TRY(ReadRowMajMat(&B, "matB3"), "f4");
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");
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");
list_id_reductors += p_current_storage_matrix1->id() + " ";
......@@ -98,14 +91,12 @@ std::vector<Polynomial> F4() {
TINYGB_TRY(LoadGB("gb.txt", gb, UniqueMatIds), "f4");
TINYGB_TRY(LoadCritPairs("critpairs_glob.txt", global_critical_pairs, UniqueMatIds), "f4");
std::sort(global_critical_pairs.begin(), global_critical_pairs.end());
step_number++;
GB_LeadingMonomials.clear();
for (const auto& g : gb)
GB_LeadingMonomials.insert(g.LeadingMonomial());
stop_crit = HasAllPowersOfVars(GB_LeadingMonomials);
}
global_reductors.clear();
std::vector<Polynomial> final_gb;
for (const auto& f : gb)
final_gb.push_back(f.to_polynomial());
......
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