implemented Mike's comments

Macaulay2 · Feb 9, 2023 · 9018900 · 9018900
1 parent ed2988e
commit 9018900
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/M2/Macaulay2/e/ExponentVector.hpp b/M2/Macaulay2/e/ExponentVector.hpp
@@ -273,8 +273,8 @@ class ExponentVector
 
 // Legacy specialization
 using exponents = ExponentVector<int, true>;
-typedef exponents::Exponents exponents_t;
-typedef exponents::ConstExponents const_exponents;
+using exponents_t = exponents::Exponents;
+using const_exponents = exponents::ConstExponents;
 
 // TODO: compare with ntuple_monomials in e/f4/
 template <>

diff --git a/M2/Macaulay2/e/gbweight.cpp b/M2/Macaulay2/e/gbweight.cpp
@@ -3,6 +3,7 @@
 #include "gbring.hpp"
 #include "polyring.hpp"
 
+
 GBWeight::GBWeight(const FreeModule *F, M2_arrayint wts0) : F_(F)
 {
   // If wts has length 0 or is NULL:
@@ -54,12 +55,11 @@ GBWeight::GBWeight(const FreeModule *F, M2_arrayint wts0) : F_(F)
     Fdegs_ = 0;
 }
 
-int GBWeight::exponents_weight(const int *e, int comp) const
+int GBWeight::exponents_weight(const_exponents e, int comp) const
 {
-  long sum = 0;
-  for (int i = 0; i < nvars_; i++) sum += e[i] * wts_->array[i];
+  int sum = exponents::weight(nvars_, e, wts_);
   if (use_component_degrees_ && comp > 0) sum += Fdegs_[comp];
-  return static_cast<int>(sum);
+  return sum;
 }
 
 int GBWeight::gbvector_term_weight(const gbvector *f) const
@@ -96,7 +96,7 @@ int GBWeight::gbvector_weight(const gbvector *f) const
   return gbvector_weight(f, not_used);
 }
 
-int GBWeight::monomial_weight(const int *monom, int comp) const
+int GBWeight::monomial_weight(const_monomial monom, int comp) const
 {
   exponents_t EXP = ALLOCATE_EXPONENTS(exp_size);
   R_->get_flattened_monoid()->to_expvector(monom, EXP);

diff --git a/M2/Macaulay2/e/gbweight.hpp b/M2/Macaulay2/e/gbweight.hpp
@@ -3,9 +3,13 @@
 #ifndef _gbweight_hpp_
 #define _gbweight_hpp_
 
-#include "ringelem.hpp" // TODO: needed for M2_arrayint
-#include "newdelete.hpp"
+#include "engine-includes.hpp"  // for M2_arrayint
 
+#include "ExponentVector.hpp"   // for const_exponents
+#include "monoid.hpp"           // for const_monomial
+#include "newdelete.hpp"        // for our_new_delete
+
+class FreeModule;
 class GBRing;
 class gbvector;
 
@@ -32,15 +36,15 @@ class GBWeight : public our_new_delete
   // or, if the component is 0, then it is in the ring, not in the
   // free module F_
 
-  int exponents_weight(const int *e, int comp) const;
+  int exponents_weight(const_exponents e, int comp) const;
 
   int gbvector_term_weight(const gbvector *f) const;
 
   int gbvector_weight(const gbvector *f) const;
 
   int gbvector_weight(const gbvector *f, int &lead_term_weight) const;
 
-  int monomial_weight(const int *monom, int comp) const;
+  int monomial_weight(const_monomial m, int comp) const;
 };
 
 #endif

diff --git a/M2/Macaulay2/e/matrix.cpp b/M2/Macaulay2/e/matrix.cpp
@@ -1150,7 +1150,6 @@ Matrix /* or null */ *Matrix::koszul_monomials(int nskew,
   for (int j = 0; j < nskew; j++) skew_list[j] = j;
   SkewMultiplication skew(nvars, nskew, skew_list);
   int ncols = c->n_cols();
-  const_monomial a;
 
   exponents_t aexp = newarray_atomic(int, nvars);
   exponents_t bexp = newarray_atomic(int, nvars);
@@ -1160,14 +1159,14 @@ Matrix /* or null */ *Matrix::koszul_monomials(int nskew,
   for (int i = 0; i < ncols; i++)
     {
       if (c->elem(i) == nullptr) continue;
-      a = P->lead_flat_monomial(c->elem(i)->coeff);
+      const_monomial a = P->lead_flat_monomial(c->elem(i)->coeff);
       M->to_expvector(a, aexp);
       divisors.clear();
       A->find_all_divisors(aexp, divisors);
       for (int j = 0; j < divisors.size(); j++)
         {
           int rownum = divisors[j]->basis_elem();
-          const int *b = P->lead_flat_monomial(r->elem(rownum)->coeff);
+          const_monomial b = P->lead_flat_monomial(r->elem(rownum)->coeff);
           M->to_expvector(b, bexp);
           exponents::divide(nvars, aexp, bexp, result_exp);
           int sign = skew.mult_sign(result_exp, bexp);