Changeset 4819c4 in git

Timestamp:

Nov 13, 2018, 1:15:30 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

21627ce8138b555fd3149fbe3683998b56b92633

Parents:

c6363181cd15d8f5d14b9a1cd20f08907c4c13b6

Message:

moved freeAlgebra construction to kernel (libpolys/polys/shiftop)

Files:

• Singular/dyn_modules/freegb/freegb.cc (modified) (1 diff)
• Singular/libsingular.h (modified) (1 diff)
• libpolys/polys/shiftop.cc (modified) (1 diff)
• libpolys/polys/shiftop.h (modified) (1 diff)

Singular/dyn_modules/freegb/freegb.cc

@@ -20 +20 @@
       return TRUE;
     }
-    ring R=rCopy0(r);
-    int p;
-    if((r->order[0]==ringorder_C)
-    ||(r->order[0]==ringorder_c))
-      p=1;
-    else
-      p=0;
-    // create R->N
-    R->N=r->N*d;
-    R->isLPring=r->N;
-    R->block1[p]=R->N; /* only dp,Dp,wp,Wp; will be discarded for lp*/
-    // create R->order
-    switch(r->order[p])
-    {
-      case ringorder_dp:
-      case ringorder_Dp:
-        break;
-      case ringorder_wp:
-      case ringorder_Wp:
-      {
-        omFree(R->wvhdl[p]);
-        int *w=(int*)omAlloc(R->N*sizeof(int));
-        for(int b=1;b<d;b++)
-        {
-          for(int i=r->N-1;i>=0;i--)
-            w[b*r->N+i]=r->wvhdl[p][i];
-        }
-        R->wvhdl[p]=w;
-        break;
-      }
-      case ringorder_lp:
-      case ringorder_rp:
-      {
-        int ** wvhdl=(int**)omAlloc0((r->N+2)*sizeof(int*));
-        rRingOrder_t* ord=(rRingOrder_t*)omAlloc0((r->N+2)*sizeof(rRingOrder_t));
-        int* blk0=(int*)omAlloc0((r->N+2)*sizeof(int));
-        int* blk1=(int*)omAlloc0((r->N+2)*sizeof(int));
-        omFree(R->wvhdl);  R->wvhdl=wvhdl;
-        omFree(R->order);  R->order=ord;
-        omFree(R->block0); R->block0=blk0;
-        omFree(R->block1); R->block1=blk1;
-        for(int i=0;i<r->N;i++)
-        {
-          ord[i+p]=ringorder_a;
-          blk0[i+p]=1;
-          blk1[i+p]=R->N;
-          wvhdl[i+p]=(int*)omAlloc0(R->N*sizeof(int));
-          for(int j=0;j<d;j++)
-          {
-            assume(j*r->N+i<R->N);
-            if (r->order[p]==ringorder_lp)
-              wvhdl[i+p][j*r->N+i]=1;
-            else
-              wvhdl[i+p][(j+1)*r->N-i-1]=1;
-          }
-        }
-        ord[r->N+p]=r->order[p]; /* lp or rp */
-        blk0[r->N+p]=1;
-        blk1[r->N+p]=R->N;
-        // copy component order
-        if (p==1) ord[0]=r->order[0];
-        else /*p==0*/ ord[r->N+1]=r->order[1];
-        break;
-      }
-      default: WerrorS("ordering not implemented for LP-rings");
-        return TRUE;
-    }
-    // create R->names
-    char **names=(char**)omAlloc(R->N*sizeof(char_ptr));
-    for(int b=0;b<d;b++)
-    {
-      for(int i=r->N-1;i>=0;i--)
-        names[b*r->N+i]=omStrDup(r->names[i]);
-    }
-    for(int i=r->N-1;i>=0;i--) omFree(R->names[i]);
-    omFree(R->names);
-    R->names=names;
-
-    rComplete(R,TRUE);
+    ring R=freeAlgebra(r,d);
     res->rtyp=RING_CMD;
     res->data=R;
-    return FALSE;
+    return R==NULL;
   }
   return TRUE;

Singular/libsingular.h

@@ -16 +16 @@
 #include "polys/clapsing.h"
 #include "polys/monomials/maps.h"
+#include "polys/shiftop.h"
 #include "kernel/GBEngine/kutil.h"
 #include "kernel/GBEngine/kstd1.h"

libpolys/polys/shiftop.cc

@@ -661 +661 @@
 }
 
-#endif
+ring freeAlgebra(ring r, int d)
+{
+  ring R=rCopy0(r);
+  int p;
+  if((r->order[0]==ringorder_C)
+  ||(r->order[0]==ringorder_c))
+    p=1;
+  else
+    p=0;
+  // create R->N
+  R->N=r->N*d;
+  R->isLPring=r->N;
+  R->block1[p]=R->N; /* only dp,Dp,wp,Wp; will be discarded for lp*/
+  // create R->order
+  switch(r->order[p])
+  {
+    case ringorder_dp:
+    case ringorder_Dp:
+      break;
+    case ringorder_wp:
+    case ringorder_Wp:
+    {
+      omFree(R->wvhdl[p]);
+      int *w=(int*)omAlloc(R->N*sizeof(int));
+      for(int b=1;b<d;b++)
+      {
+        for(int i=r->N-1;i>=0;i--)
+          w[b*r->N+i]=r->wvhdl[p][i];
+      }
+      R->wvhdl[p]=w;
+      break;
+    }
+    case ringorder_lp:
+    case ringorder_rp:
+    {
+      int ** wvhdl=(int**)omAlloc0((r->N+2)*sizeof(int*));
+      rRingOrder_t* ord=(rRingOrder_t*)omAlloc0((r->N+2)*sizeof(rRingOrder_t));
+      int* blk0=(int*)omAlloc0((r->N+2)*sizeof(int));
+      int* blk1=(int*)omAlloc0((r->N+2)*sizeof(int));
+      omFree(R->wvhdl);  R->wvhdl=wvhdl;
+      omFree(R->order);  R->order=ord;
+      omFree(R->block0); R->block0=blk0;
+      omFree(R->block1); R->block1=blk1;
+      for(int i=0;i<r->N;i++)
+      {
+        ord[i+p]=ringorder_a;
+        blk0[i+p]=1;
+        blk1[i+p]=R->N;
+        wvhdl[i+p]=(int*)omAlloc0(R->N*sizeof(int));
+        for(int j=0;j<d;j++)
+        {
+          assume(j*r->N+i<R->N);
+          if (r->order[p]==ringorder_lp)
+            wvhdl[i+p][j*r->N+i]=1;
+         else
+            wvhdl[i+p][(j+1)*r->N-i-1]=1;
+        }
+      }
+      ord[r->N+p]=r->order[p]; /* lp or rp */
+      blk0[r->N+p]=1;
+      blk1[r->N+p]=R->N;
+      // copy component order
+      if (p==1) ord[0]=r->order[0];
+      else /*p==0*/ ord[r->N+1]=r->order[1];
+      break;
+    }
+    default: WerrorS("ordering not implemented for LP-rings");
+      return NULL;
+  }
+  // create R->names
+  char **names=(char**)omAlloc(R->N*sizeof(char*));
+  for(int b=0;b<d;b++)
+  {
+    for(int i=r->N-1;i>=0;i--)
+      names[b*r->N+i]=omStrDup(r->names[i]);
+  }
+  for(int i=r->N-1;i>=0;i--) omFree(R->names[i]);
+  omFree(R->names);
+  R->names=names;
+
+  rComplete(R,TRUE);
+  return R;
+}
+#endif

libpolys/polys/shiftop.h

@@ -48 +48 @@
 #define pmIsInV(p) p_mIsInV(p, currRing)
 
+ring freeAlgebra(ring r, int d);
 #endif
 #endif