Changeset 79f80f in git

Timestamp:

Jan 13, 2000, 3:18:58 PM (23 years ago)

Author:

Thomas Siebert <siebert@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

3cc3f69eaf583a0a6e659462d814023a400c19ce

Parents:

c284cea94669c008bc37b4e349182a16b68b8e6e

Message:

Extension for lift


git-svn-id: file:///usr/local/Singular/svn/trunk@4082 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• ideals.cc (modified) (6 diffs)
• ideals.h (modified) (3 diffs)
• iparith.cc (modified) (2 diffs)

Singular/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.81 2000-01-04 15:17:15 siebert Exp $ */
+/* $Id: ideals.cc,v 1.82 2000-01-13 14:18:58 siebert Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -1609 +1609 @@
 * of mod
 */
-ideal idLiftNonStB(ideal  mod, ideal submod,BOOLEAN goodShape)
-{
-  return idLift(mod, submod, goodShape, FALSE);
-}
-
-
-ideal idLift(ideal mod,ideal submod,BOOLEAN goodShape, BOOLEAN isSB)
+ideal   idLiftNonStB (ideal  mod, ideal submod,ideal * rest,
+             BOOLEAN goodShape,BOOLEAN divide)
+{
+  return idLift(mod, submod, rest, goodShape, FALSE);
+}
+
+
+ideal   idLift (ideal mod, ideal submod,ideal * rest,
+             BOOLEAN goodShape, BOOLEAN isSB,BOOLEAN divide)
 {
   int   lsmod =idRankFreeModule(submod), i, j, k;
+  int ordSgn=currRing->OrdSgn;
+  int comps_to_add=0;
+  poly p;
 
   if (idIs0(mod))
     return idInit(1,mod->rank);
-
+//#define NEW_LIFT
+//#define TEST_LIFT
+#ifdef TEST_LIFT
+//divide=TRUE;
+Print("The module is:\n");
+idPrint(mod);
+Print("The submodule is:\n");
+idPrint(submod);
+#endif
+#ifdef NEW_LIFT
+  if (ordSgn==-1)
+  {
+    comps_to_add = IDELEMS(submod);
+    while ((comps_to_add>0) && (submod->m[comps_to_add-1]==NULL)) 
+      comps_to_add--;
+  }
+#endif
   k=idRankFreeModule(mod);
   if  ((k!=0) && (lsmod==0)) lsmod=1;
@@ -1645 +1666 @@
   {
     s_h3 = idCopy(s_mod);
-    idPrepareStd(s_h3, k);
+    idPrepareStd(s_h3, k+comps_to_add);
   }
   else
   {
-    s_h3 = idPrepare(s_mod,(tHomog)FALSE,k,NULL);
+    s_h3 = idPrepare(s_mod,(tHomog)FALSE,k+comps_to_add,NULL);
   }
   if (!goodShape)
@@ -1668 +1689 @@
     }
   }
+#ifdef NEW_LIFT
+  if (ordSgn==-1)
+  {
+    for(j = 0;j<comps_to_add;j++)
+    {
+      p = s_temp->m[j];
+      if (p!=NULL)
+      {
+        while (pNext(p)!=NULL) pIter(p);
+        pNext(p) = pOne();
+        pIter(p);
+        pSetComp(p,1+j+k);
+        pSetmComp(p);
+      }
+    }
+  }
+#endif
   ideal s_result = kNF(s_h3,currQuotient,s_temp,k);
   s_result->rank = s_h3->rank;
+  ideal s_rest = idInit(IDELEMS(s_result),k);
   idDelete(&s_h3);
   idDelete(&s_temp);
@@ -1679 +1718 @@
       if (pGetComp(s_result->m[j])<=k)
       {
-        if (isSB)
+        if (!divide)
         {
-          WarnS("first module not a standardbasis\n"
-            "// ** or second not a proper submodule");
+          if (isSB)
+          {
+            WarnS("first module not a standardbasis\n"
+              "// ** or second not a proper submodule");
+          }
+          else
+            WerrorS("2nd module lies not in the first");
+          idDelete(&s_result);
+          idDelete(&s_rest);
+          s_result=idInit(IDELEMS(submod),submod->rank);
+          break;
         }
         else
-          WerrorS("2nd module lies not in the first");
-        idDelete(&s_result);
-        s_result=idInit(IDELEMS(submod),submod->rank);
-        break;
-      }
-      else
-      {
-        pShift(&(s_result->m[j]),-k);
-        pNeg(s_result->m[j]);
-      }
-    }
-  }
-
+        {
+          p = s_rest->m[j] = s_result->m[j];
+          while ((pNext(p)!=NULL) && (pGetComp(pNext(p))<=k)) pIter(p);
+          s_result->m[j] = pNext(p);
+          pNext(p) = NULL;
+        }
+      }
+      pShift(&(s_result->m[j]),-k);
+      pNeg(s_result->m[j]);
+    }
+  }
+  if ((lsmod==0) && (!idIs0(s_rest)))
+  {
+    for (j=IDELEMS(s_rest);j>0;j--)
+    {
+      if (s_rest->m[j-1]!=NULL)
+      {
+        pShift(&(s_rest->m[j-1]),-1);
+        s_rest->m[j-1] = pNeg(s_rest->m[j-1]);
+      }
+    }
+  }
+#ifdef TEST_LIFT
+Print("The lift is:\n");
+idPrint(s_result);
+Print("The rest is:\n");
+if (s_rest!=NULL) idPrint(s_rest);
+#endif
   if(syz_ring!=orig_ring)
   {
@@ -1703 +1766 @@
     rChangeCurrRing(orig_ring,TRUE);
     s_result = idrMoveR_NoSort(s_result, syz_ring);
+    s_rest = idrMoveR_NoSort(s_rest, syz_ring);
     rKill(syz_ring);
   }
+  if (rest!=NULL)
+    *rest = s_rest;
+  else
+    idDelete(&s_rest);
   return s_result;
 }

Singular/ideals.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.h,v 1.17 2000-01-04 15:17:16 siebert Exp $ */
+/* $Id: ideals.h,v 1.18 2000-01-13 14:18:57 siebert Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -21 +21 @@
   /*- deletes an ideal -*/
 #endif
+void idShow(ideal id);
 void idPrint(ideal id);
   /*- initialise an ideal -*/
@@ -87 +88 @@
 ideal   idLiftStd  (ideal h1, matrix *m, tHomog h=testHomog);
 
-ideal   idLift (ideal mod, ideal sumod,BOOLEAN goodShape=FALSE,
-               BOOLEAN isSB=TRUE);
-ideal   idLiftNonStB (ideal  mod, ideal submod,BOOLEAN goodShape=FALSE);
+ideal   idLift (ideal mod, ideal sumod,ideal * rest=NULL,
+             BOOLEAN goodShape=FALSE, BOOLEAN isSB=TRUE,BOOLEAN divide=FALSE);
+ideal   idLiftNonStB (ideal  mod, ideal submod,ideal * rest=NULL,
+             BOOLEAN goodShape=FALSE,BOOLEAN divide=FALSE);
 
 intvec * idMWLift(ideal mod,intvec * weights);

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.199 2000-01-13 10:33:19 Singular Exp $ */
+/* $Id: iparith.cc,v 1.200 2000-01-13 14:18:58 siebert Exp $ */
 
 /*
@@ -1725 +1725 @@
   int ul= IDELEMS((ideal)u->Data());
   int vl= IDELEMS((ideal)v->Data());
+  //if (currRing->OrdSgn==-1) ul += vl;  //to add if NEW_LIFT defined
   if (hasFlag(u,FLAG_STD))
   {