Changeset a7bb5f0 in git

Timestamp:

Jan 17, 2022, 5:26:30 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

936bb3e324ac78276f6695011e53cac7bdf9321f

Parents:

c4a26cb4e8c6f977201ace111bde272a4c4d1664

Message:

xalloc and ringorder_a64

Files:

• kernel/ideals.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (11 diffs)

kernel/ideals.cc

@@ -1740 +1740 @@
       {
         int l=(origR->block1[k]-origR->block0[k]+1)*sizeof(int);
+        if (origR->order[k]==ringorder_a64) l*=2;
         wv[k+1]=(int*)omalloc(l);
         memcpy(wv[k+1],origR->wvhdl[k],l);

libpolys/polys/monomials/ring.cc

@@ -987 +987 @@
         {
           int l=(r2->block1[0]-r2->block0[0]+1)*sizeof(int);
+          if (r2->order[0]==ringorder_a64) l*=2;
           tmpR.wvhdl[1]=(int*)omalloc(l);
           memcpy(tmpR.wvhdl[1],r2->wvhdl[0],l);
@@ -1073 +1074 @@
           {
             int l=(r1->block1[i]-r1->block0[i]+1)*sizeof(int);
+            if (r1->order[i]==ringorder_a64) l*=2;
             tmpR.wvhdl[i]=(int*)omalloc(l);
             memcpy(tmpR.wvhdl[i],r1->wvhdl[i],l);
@@ -1101 +1103 @@
               {
                 int l=(r2->block1[i]-r2->block0[i]+1)*sizeof(int);
+                if (r2->order[i]==ringorder_a64) l*=2;
                 tmpR.wvhdl[j]=(int*)omalloc(l);
                 memcpy(tmpR.wvhdl[j],r2->wvhdl[i],l);
@@ -1136 +1139 @@
           {
             int l=(r1->block1[i]-r1->block0[i]+1)*sizeof(int);
+            if (r1->order[i]==ringorder_a64) l*=2;
             tmpR.wvhdl[i]=(int*)omalloc(l);
             memcpy(tmpR.wvhdl[i],r1->wvhdl[i],l);
@@ -1484 +1488 @@
         {
           int l=(r->block1[j]-r->block0[j]+1)*sizeof(int);
+          if (r->order[j]==ringorder_a64) l*=2;
           res->wvhdl[j]=(int*)omalloc(l);
           memcpy(res->wvhdl[j],r->wvhdl[j],l);
@@ -1622 +1627 @@
         {
           int l=(r->block1[j]-r->block0[j]+1)*sizeof(int);
+          if (r->order[j]==ringorder_a64) l*=2;
           res->wvhdl[j+1]=(int*)omalloc(l);
           memcpy(res->wvhdl[j+1],r->wvhdl[j],l);
@@ -2287 +2293 @@
 
 static void rO_WDegree64(int &place, int &bitplace, int start, int end,
-    long *o, sro_ord &ord_struct, int *weights)
+    long *o, sro_ord &ord_struct, int64 *weights)
 {
   // weighted degree (aligned) of variables v_start..v_end, ordsgn 1,
@@ -3498 +3504 @@
       case ringorder_a64:
         rO_WDegree64(j,j_bits,r->block0[i],r->block1[i],tmp_ordsgn,
-                     tmp_typ[typ_i], r->wvhdl[i]);
+                     tmp_typ[typ_i], (int64 *)(r->wvhdl[i]));
         typ_i++;
         break;
@@ -4502 +4508 @@
       {
         int l=(r->block1[j-1]-r->block0[j-1]+1)*sizeof(int);
+        if (r->order[j-1]==ringorder_a64) l*=2;
         wvhdl[j]=(int*)omalloc(l);
         memcpy(wvhdl[j],r->wvhdl[j-1],l);
@@ -4688 +4695 @@
       {
         int l=(r->block1[j]-r->block0[j]+1)*sizeof(int);
+        if (r->order[j]==ringorder_a64) l*=2;
         new_r->wvhdl[j]=(int*)omalloc(l);
         memcpy(new_r->wvhdl[j],r->wvhdl[j],l);
@@ -4920 +4928 @@
       {
         int l=(r->block1[i]-r->block0[i]+1)*sizeof(int);
+        if (r->order[i]==ringorder_a64) l*=2;
         wvhdl[j]=(int*)omalloc(l);
         memcpy(wvhdl[j],r->wvhdl[i],l);