Changeset 741464 in git

Timestamp:

Jan 30, 2015, 10:55:49 AM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

c9fcd5e3b1b695444030076b43c81e910fb047db

Parents:

b5396f0e7a5f63b75bd8c6911edfd4d7e1b61840

Message:

add: id_Shift

Files:

• Singular/iparith.cc (modified) (1 diff)
• kernel/GBEngine/syz.cc (modified) (1 diff)
• kernel/GBEngine/syz0.cc (modified) (5 diffs)
• kernel/GBEngine/syz3.cc (modified) (2 diffs)
• kernel/ideals.cc (modified) (5 diffs)
• libpolys/polys/simpleideals.cc (modified) (2 diffs)
• libpolys/polys/simpleideals.h (modified) (1 diff)

Singular/iparith.cc

@@ -1761 +1761 @@
     if (s+p_MinComp(M->m[i],currRing)<=0)
     { id_Delete(&M,currRing);return TRUE;}
-    p_Shift(&(M->m[i]),s,currRing);
-  }
-  M->rank += s; 
+  }
+  id_Shift(M,s,currRing);
   res->data=M;
   return FALSE;

kernel/GBEngine/syz.cc

@@ -604 +604 @@
     if (! idIs0(res[i]))
     {
-      for (j=0; j<IDELEMS(res[i]); j++)
-      {
-        p_Shift(&res[i]->m[j], -rGetMaxSyzComp(i, currRing),currRing);
-      }
+      id_Shift(res[i],-rGetMaxSyzComp(i, currRing),currRing);
     }
   }

kernel/GBEngine/syz0.cc

@@ -668 +668 @@
               for(k=0;k<IDELEMS(result);k++) pDelete(&((*Shdl)[k]));
 
-              kBucketDestroy(&(sy0buck));
+              kBucketDestroy(&(sy0buck));
               return result;
             }
@@ -841 +841 @@
 }
 
-static void idShift(ideal arg,int index)
-{
-  int i,j=rGetMaxSyzComp(index, currRing);
-  for (i=0;i<IDELEMS(arg);i++)
-  {
-    if (arg->m[i]!=NULL)
-      p_Shift(&arg->m[i],-j,currRing);
-  }
-}
-
 #if 0 /*debug only */
 static void syPrintResolution(resolvente res,int start,int length)
@@ -918 +908 @@
         if (syRing != origR)
         {
-          rChangeCurrRing(syRing);
+          rChangeCurrRing(syRing);
           for (i=0; i<IDELEMS(res[1]); i++)
           {
@@ -931 +921 @@
         if (syRing != origR)
         {
-          rChangeCurrRing(syRing);
+          rChangeCurrRing(syRing);
           for (i=0; i<IDELEMS(res[0]); i++)
           {
@@ -954 +944 @@
     while ((syzIndex < *length) && (!idIs0(res[syzIndex])))
     {
-      idShift(res[syzIndex],syzIndex);
+      id_Shift(res[syzIndex],-rGetMaxSyzComp(syzIndex, currRing),currRing);
       syzIndex++;
     }

kernel/GBEngine/syz3.cc

@@ -1788 +1788 @@
   if (rk_arg==0)
   {
-    for (j=0;j<IDELEMS(temp);j++)
-    {
-      if (temp->m[j]!=NULL)
-        p_Shift(&temp->m[j],1,currRing);
-    }
+    id_Shift(temp,1,currRing);
   }
   idSkipZeroes(temp);
@@ -2003 +1999 @@
             PrintS("Da ist was faul!!!\n");
             Print("Aber: Regularitaet %d, Grad %ld\n",
-                   syzstr->regularity,p_FDeg(totake[index]->m[i],currRing));
+                   syzstr->regularity,p_FDeg(totake[index]->m[i],currRing));
           }
         }

kernel/ideals.cc

@@ -476 +476 @@
   if (k == 0)
   {
-    for (j=0; j<=i; j++) p_Shift(&(h2->m[j]),1,currRing);
+    id_Shift(h2,1,currRing);
     k = 1;
   }
@@ -575 +575 @@
   {
     ideal result=idFreeModule(idElemens_h1/*IDELEMS(h1)*/);
-    int curr_syz_limit=rGetCurrSyzLimit(currRing);
-    if (curr_syz_limit>0)
-    for (ii=0;ii<idElemens_h1/*IDELEMS(h1)*/;ii++)
-    {
-      if (h1->m[ii]!=NULL)
-        p_Shift(&h1->m[ii],curr_syz_limit,currRing);
-    }
     return result;
   }
@@ -772 +765 @@
     {
       *syz=idFreeModule(IDELEMS(h1));
-      int curr_syz_limit=rGetCurrSyzLimit(currRing);
-      if (curr_syz_limit>0)
-      for (int ii=0;ii<IDELEMS(h1);ii++)
-      {
-        if (h1->m[ii]!=NULL)
-          p_Shift(&h1->m[ii],curr_syz_limit,currRing);
-      }
     }
     return idInit(1,h1->rank);
@@ -1017 +1003 @@
   if (lsmod==0)
   {
-    for (j=IDELEMS(s_temp);j>0;j--)
-    {
-      if (s_temp->m[j-1]!=NULL)
-        p_Shift(&(s_temp->m[j-1]),1,currRing);
-    }
+    id_Shift(s_temp,1,currRing);
   }
   if (unit!=NULL)
@@ -1269 +1251 @@
       {
         p = p_Copy_noCheck(h4->m[i-1], currRing); p_Shift(&p,1,currRing);
-        // pTest(p);
+        // pTest(p);
         h4->m[i] = p;
       }

libpolys/polys/simpleideals.cc

@@ -90 +90 @@
     if (p!=NULL)
        if (p_LmIsConstantComp(p, r) == TRUE)
-         return k;
+         return k;
   }
 
@@ -1734 +1734 @@
   return result;
 }
+
+void id_Shift(ideal M, int s, const ring r)
+{
+  for(int i=IDELEMS(M)-1; i>=0;i--)
+  {
+    p_Shift(&(M->m[i]),s,r);
+  }
+  M->rank += s;
+}

libpolys/polys/simpleideals.h

@@ -152 +152 @@
 
 ideal id_ChineseRemainder(ideal *xx, number *q, int rl, const ring r);
+
+void id_Shift(ideal M, int s, const ring r);
 #endif