Changeset 43b04d in git

Timestamp:

Jul 3, 2015, 9:57:43 AM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

1550ecaad46efdce1c9032818b53259c1f6c108a

Parents:

74dcead93fa7d8032514e5919362facbb50b1c0e

Message:

Added rAssure_c_dp(ring r)

Files:

• kernel/combinatorics/hdegree.cc (modified) (1 diff)
• libpolys/polys/kbuckets.cc (modified) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.h (modified) (1 diff)

kernel/combinatorics/hdegree.cc

@@ -1031 +1031 @@
   else
     hNstc = hNexist;
+  if (hNexist==0)
+  {
+    return;
+  }
   hwork = (scfmon)omAlloc(hNexist * sizeof(scmon));
   hvar = (varset)omAlloc((hNvar + 1) * sizeof(int));

libpolys/polys/kbuckets.cc

@@ -14 +14 @@
 #include <coeffs/coeffs.h>
 #include <polys/monomials/ring.h>
-//#include <kernel/p_Procs.h>
+//#include <libpolys/polys/templates/p_Procs.h>
 //#include <kernel/GBEngine/kutil.h>
 #include <polys/kbuckets.h>

libpolys/polys/monomials/p_polys.cc

@@ -4530 +4530 @@
 unsigned long p_GetShortExpVector(const poly p, const ring r)
 {
+  if (p == NULL) return 0;
   assume(p != NULL);
-  if (p == NULL) return 0;
   unsigned long ev = 0; // short exponent vector
   unsigned int n = BIT_SIZEOF_LONG / r->N; // number of bits per exp

libpolys/polys/monomials/ring.cc

@@ -4861 +4861 @@
 {
   return rAssure_Global(ringorder_C, ringorder_dp, r);
+}
+
+ring rAssure_c_dp(const ring r)
+{
+  return rAssure_Global(ringorder_c, ringorder_dp, r);
 }
 

libpolys/polys/monomials/ring.h

@@ -724 +724 @@
 ring   rAssure_dp_C(const ring r);
 ring   rAssure_C_dp(const ring r);
+ring   rAssure_c_dp(const ring r);
 
 /// makes sure that c/C ordering is last ordering