Changeset e0d91c in git

Timestamp:

Sep 22, 1998, 4:09:05 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

7709bf1f0117c77f62572e798d2164f8f0a773a4

Parents:

8a839d187e734df8873c2c8aa439609fb0eb3333

Message:

* hannes: cosmetic changes


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

Location:

Singular

Files:

• algmap.cc (modified) (2 diffs)
• clapsing.cc (modified) (6 diffs)
• syz0.cc (modified) (4 diffs)
• syz1.cc (modified) (61 diffs)
• tesths.cc (modified) (8 diffs)

Singular/algmap.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: algmap.cc,v 1.10 1998-03-27 15:43:17 obachman Exp $ */
+/* $Id: algmap.cc,v 1.11 1998-09-22 14:09:00 Singular Exp $ */
 /*
 * ABSTRACT - the mapping of polynomials from rings with
@@ -204 +204 @@
   poly q, q0, q1 = NULL;
   int i;
-  
+
   if (s == 0)
   {

Singular/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.39 1998-07-29 13:55:43 Singular Exp $
+// $Id: clapsing.cc,v 1.40 1998-09-22 14:09:01 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -407 +407 @@
     CanonicalForm g, h;
     poly p = pNext(f);
-    nTest(pGetCoeff(f));
+    //nTest(pGetCoeff(f));
     FACTORY_ALGOUT( "G = ", (((lnumber)pGetCoeff(f))->z) );
     g = convSingTrClapP( ((lnumber)pGetCoeff(f))->z );
@@ -414 +414 @@
     while ( (p != NULL) && (g != 1) )
     {
-      nTest(pGetCoeff(p));
+      //nTest(pGetCoeff(p));
       FACTORY_ALGOUT( "h = ", (((lnumber)pGetCoeff(p))->z) );
       h = convSingTrClapP( ((lnumber)pGetCoeff(p))->z );
@@ -464 +464 @@
         #endif
         c->z=convClapPSingTr( i.getItem() / g );
-        nTest((number)c);
+        //nTest((number)c);
         //#ifdef LDEBUG
         //number cn=(number)c;
@@ -940 +940 @@
   int sw=(int)dummy->Data();
   ideal f=singclap_factorize((poly)(u->Data()), &v, sw);
+  if (f==NULL)
+    return TRUE;
   switch(sw)
   {
@@ -957 +959 @@
     case 1:
       res->data=(void *)f;
-      return f==NULL;
+      return FALSE;
+    case 3:
+      {
+        poly p=f->m[0];
+        int i=IDELEMS(f);
+        f->m[0]=NULL;
+        while(i>1)
+        {
+          i--;
+          p=pMult(p,f->m[i]);
+          f->m[i]=NULL;
+        }
+        res->data=(void *)p;
+        res->rtyp=POLY_CMD;
+      }
+      return FALSE;
   }
   WerrorS("invalid switch");

Singular/syz0.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz0.cc,v 1.16 1998-06-12 17:41:41 obachman Exp $ */
+/* $Id: syz0.cc,v 1.17 1998-09-22 14:09:02 Singular Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -433 +433 @@
   int j,i=0;
   poly p;
-  
+
   if (toNorm==NULL) return NULL;
   p = pHead(toNorm);
@@ -447 +447 @@
       //pNorm(toNorm);
       toNorm = spSpolyRed(currQuotient->m[i],toNorm,NULL, SpolyLoop);
-      pDelete(&p); 
+      pDelete(&p);
       if (toNorm==NULL) return NULL;
       p = pHead(toNorm);
@@ -805 +805 @@
         bl1[j] = currRing->block1[m_order];
         wv[j] = currRing->wvhdl[m_order];
-        tmpR = *currRing;
-        tmpR.order = ord;
-        tmpR.block0 = bl0;
-        tmpR.block1 = bl1;
-        tmpR.wvhdl = wv;
-        rComplete(&tmpR);
+        tmpR = *currRing;
+        tmpR.order = ord;
+        tmpR.block0 = bl0;
+        tmpR.block1 = bl1;
+        tmpR.wvhdl = wv;
+        rComplete(&tmpR);
         rChangeCurrRing(&tmpR, TRUE);
       }

Singular/syz1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz1.cc,v 1.31 1998-08-05 11:40:58 siebert Exp $ */
+/* $Id: syz1.cc,v 1.32 1998-09-22 14:09:03 Singular Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -169 +169 @@
            /*4 handle module case:*/
            if (pGetComp(p1)==pGetComp(p2)) return 0;
-           else if 
-              (currcomponents[pGetComp(p1)]>currcomponents[pGetComp(p2)]) 
+           else if
+              (currcomponents[pGetComp(p1)]>currcomponents[pGetComp(p2)])
                 return 1;
            else return -1;
@@ -194 +194 @@
   int n1 = normal_syzcomp2dpc(p1, p2);
   int n2 = SyVecSyzCmp(p1, p2);
-  
+
   if (n1 != n2)
   {
@@ -281 +281 @@
   }
   for (int i=0;i<pVariables;i++)
-  {  
+  {
     binomials[i*(highdeg_1)/*i,0*/]=0;
   }
@@ -323 +323 @@
   poly q,result=q=pNew();
   int j;
-  
+
   if (pGetOrder(p)>0)
   {
-    loop 
+    loop
     {
       spMemcpy(q,p);
@@ -346 +346 @@
     poly lastmon=NULL;
     int i=0;
-    loop 
+    loop
     {
       if (pGetOrder(p)!=i)
@@ -380 +380 @@
   poly q,result=q=pNew();
   int j;
-  
+
   if (pGetOrder(p)>0)
   {
-    loop 
+    loop
     {
       spMemcpy(q,p);
@@ -404 +404 @@
     poly lastmon=NULL;
     int i=0;
-    loop 
+    loop
     {
       if (pGetOrder(p)!=i)
@@ -439 +439 @@
   poly q,result=q=pNew();
   int j;
-  
+
   if (pGetOrder(p)>0)
   {
-    loop 
+    loop
     {
       spMemcpy(q,p);
@@ -462 +462 @@
     poly lastmon=NULL;
     int i=0;
-    loop 
+    loop
     {
       if (pGetOrder(p)!=i)
@@ -574 +574 @@
 {
   poly temp1 = pCopy(m1);
-  
+
   poly p1 = normal_sySPAdd(m1, m2, m);
   poly p2 = syVecSpoly(m2, temp1, m);
-  
+
   pTest(p1);
   pTest(p2);
-  if (p1 != NULL) 
+  if (p1 != NULL)
   {
     if (p2 == NULL || ! pEqual(p1, p2))
@@ -591 +591 @@
     }
   }
-  else if (p2 != NULL) 
+  else if (p2 != NULL)
     PrintS("Error in SySpoly\n");
 
@@ -683 +683 @@
         break;
     }
-    else 
+    else
     {
       j = currcomponents[pGetComp(m1)]-currcomponents[pGetComp(m2)];
@@ -695 +695 @@
           break;
       }
-      else 
+      else
       {
         if (j<0/*currcomponents[pGetComp(m1)]<currcomponents[pGetComp(m2)]*/)
@@ -809 +809 @@
 #if defined(HAVE_SY_VECTOR) && ! defined (SY_VEC_DEBUG)
     res = sySpolyProc(m2, m1,a);
-#else    
+#else
   if (pGetOrder(m1)>0)
   {
@@ -940 +940 @@
       arg->m[(*iv)[i]-1] = NULL;
       (resPairs[0])[i].order = pTotaldegree((resPairs[0])[i].syz);
-    } 
+    }
   }
   else
@@ -983 +983 @@
   if (p==NULL) return;
   if (realcomp==0) realcomp=1;
- 
+
   if (index>1)
     tc = trind1[pGetComp(p)]-1;
@@ -1064 +1064 @@
           if (o_r->m[l]!=NULL)
           {
-            isDivisible = isDivisible || 
+            isDivisible = isDivisible ||
               pDivisibleBy2(o_r->m[l],tso.lcm);
           }
@@ -1115 +1115 @@
           if (o_r->m[l]!=NULL)
           {
-            isDivisible = isDivisible || 
+            isDivisible = isDivisible ||
               pDivisibleBy2(o_r->m[l],tso.lcm);
           }
@@ -1129 +1129 @@
     else
     {
-      nextPairs[i].p = 
+      nextPairs[i].p =
         sySPoly(tso.p1, tso.p2,tso.lcm);
       (*spl)[i] = pLength(nextPairs[i].p);
@@ -1142 +1142 @@
     for (i1=0;i1<howmuch;i1++)
     {
-      if (i2==-1) 
+      if (i2==-1)
       {
         if ((*spl)[i1]!=-1)
@@ -1174 +1174 @@
 * reduces all pairs of degree deg in the module index
 * put the reduced generators to the resolvente which contains
-* the truncated kStd 
+* the truncated kStd
 */
 static void syRedNextPairs(SSet nextPairs, syStrategy syzstr,
@@ -1201 +1201 @@
     if ((tso.p1!=NULL) && (tso.p2!=NULL))
     {
-      coefgcd = 
+      coefgcd =
         nGcd(pGetCoeff(tso.p1),pGetCoeff(tso.p2));
       tso.syz = pHead(tso.lcm);
@@ -1310 +1310 @@
         if (index % 2==0)
           euler++;
-        else 
+        else
           euler--;
       }
@@ -1354 +1354 @@
   }
   delete spl1;
-} 
+}
 
 /*3
@@ -1368 +1368 @@
 
   while ((k>0) && (res->m[k-1]==NULL)) k--;
-  while ((i<(*syzstr->Tl)[index-1]) && (((sPairs)[i].syz==NULL) || 
+  while ((i<(*syzstr->Tl)[index-1]) && (((sPairs)[i].syz==NULL) ||
           ((sPairs)[i].order<deg)))
     i++;
   if ((i>=(*syzstr->Tl)[index-1]) || ((sPairs)[i].order>deg)) return;
   while ((i<(*syzstr->Tl)[index-1]) && (((sPairs)[i].syz==NULL) ||
-         ((sPairs)[i].order==deg))) 
+         ((sPairs)[i].order==deg)))
   {
     if ((sPairs)[i].syz!=NULL)
     {
       j = k-1;
-      while ((j>=0) && (res->m[j]!=NULL) && 
+      while ((j>=0) && (res->m[j]!=NULL) &&
              ((sPairs)[i].syz!=NULL))
       {
@@ -1384 +1384 @@
         {
           //Print("r");
-          (sPairs)[i].syz = 
+          (sPairs)[i].syz =
             //spSpolyRed(res->m[j],(sPairs)[i].syz,NULL);
             sySPolyRed((sPairs)[i].syz,res->m[j]);
@@ -1463 +1463 @@
   {
     int an=0,en=sP-1;
-    loop 
+    loop
     {
       if (an>=en-1)
@@ -1537 +1537 @@
       pSetComp(p,j+1);
       ii = first;
-      loop 
+      loop
       {
         j1 = bci[ii];
@@ -1593 +1593 @@
         {
           int ii=index-1,jj=pGetComp(q);
-          while (ii>0) 
+          while (ii>0)
           {
             jj = pGetComp(syzstr->res[ii]->m[jj-1]);
@@ -1641 +1641 @@
   SSet result;
   SRes resPairs=syzstr->resPairs;
-  
+
   if (an>syzstr->length) return NULL;
   if (en>syzstr->length) en=syzstr->length;
@@ -1709 +1709 @@
       {
         t = *actdeg+*index;
-        if (((resPairs[*index])[i].lcm!=NULL) || 
+        if (((resPairs[*index])[i].lcm!=NULL) ||
               ((resPairs[*index])[i].syz!=NULL))
         {
@@ -1722 +1722 @@
         }
         i++;
-      } 
+      }
     }
     (*index)++;
@@ -1782 +1782 @@
 *  int newdeg=*actdeg,newindex=-1,i,t;
 *  SSet result;
-*  
+*
 *  while (*index>=0)
 *  {
@@ -1863 +1863 @@
 *        }
 *        i++;
-*      } 
+*      }
 *    }
 *    (*index)--;
@@ -1912 +1912 @@
   int result;
 
-  if (syzstr->res[index]==NULL) 
+  if (syzstr->res[index]==NULL)
   {
     syzstr->res[index] = idInit(init-1,1);
@@ -1949 +1949 @@
   {
     int i,j;
-  
+
     if (syzstr->resPairs!=NULL)
     {
@@ -2066 +2066 @@
     int i,j=-1,jj=-1,l;
     SRes rP=syzstr->resPairs;
-   
+
     l = syzstr->length;
     while ((l>0) && (rP[l-1]==NULL)) l--;
@@ -2074 +2074 @@
     {
       i = 0;
-      while ((i<(*syzstr->Tl)[l]) && 
+      while ((i<(*syzstr->Tl)[l]) &&
         ((rP[l][i].lcm!=NULL) || (rP[l][i].syz!=NULL)))
       {
-        if (rP[l][i].isNotMinimal==NULL) 
+        if (rP[l][i].isNotMinimal==NULL)
         {
           if (j<rP[l][i].order-l)
@@ -2094 +2094 @@
     {
       j = 0;
-      while ((j<(*syzstr->Tl)[i]) && 
+      while ((j<(*syzstr->Tl)[i]) &&
         ((rP[i][j].lcm!=NULL) || (rP[i][j].syz!=NULL)))
       {
@@ -2147 +2147 @@
   {
     SRes rP=syzstr->resPairs;
-   
+
     l = syzstr->length;
     while ((l>0) && (rP[l-1]==NULL)) l--;
@@ -2155 +2155 @@
     {
       i = 0;
-      while ((i<(*syzstr->Tl)[l]) && 
+      while ((i<(*syzstr->Tl)[l]) &&
         ((rP[l][i].lcm!=NULL) || (rP[l][i].syz!=NULL)) &&
         (rP[l][i].isNotMinimal!=NULL))
@@ -2169 +2169 @@
     return l;
   }
-  else 
+  else
     return sySize(syzstr);
 }
@@ -2228 +2228 @@
 void syPrint(syStrategy syzstr)
 {
-  if ((syzstr->resPairs==NULL) && (syzstr->fullres==NULL) 
+  if ((syzstr->resPairs==NULL) && (syzstr->fullres==NULL)
      && (syzstr->minres==NULL))
   {
@@ -2246 +2246 @@
       {
         j=0;
-        while ((j<(*syzstr->Tl)[l]) && 
+        while ((j<(*syzstr->Tl)[l]) &&
           ((rP[l][j].lcm!=NULL) || (rP[l][j].syz!=NULL)))
         {
@@ -2329 +2329 @@
   resolvente fullres;
   fullres = (resolvente)Alloc0((length+1)*sizeof(ideal));
-  if (totake==NULL) 
+  if (totake==NULL)
     totake = res;
   for (i=length-1;i>0;i--)
@@ -2471 +2471 @@
   if (toStrip==NULL) return p;
   poly pp=p;
-  
+
   while ((pp!=NULL) && ((*toStrip)[pGetComp(pp)]!=0))
     pDelete1(&pp);
   p = pp;
-  if (pp!=NULL) 
+  if (pp!=NULL)
   {
     while (pNext(pp)!=NULL)
@@ -2522 +2522 @@
           pGetCoeff(tq) = nNeg(pGetCoeff(tq));
           q = syAdd(q,syMultT1(tempStripped,tq));
-        }  
+        }
         pIter(p);
       }
@@ -2558 +2558 @@
         {
           ri->m[j] = ri->m[j+k];
-          (*changes)[j+k+1] = j+1; 
+          (*changes)[j+k+1] = j+1;
           j++;
         }
@@ -2622 +2622 @@
         else
         {
-          if (sPairs[i].syzind<l) 
+          if (sPairs[i].syzind<l)
           {
             l = sPairs[i].syzind;
@@ -2634 +2634 @@
     j++;
     k = l;
-  } 
+  }
   return result;
 }
 
-static resolvente syReadOutMinimalRes(syStrategy syzstr, 
+static resolvente syReadOutMinimalRes(syStrategy syzstr,
            BOOLEAN computeStd=FALSE)
 {
@@ -2659 +2659 @@
   pSetmProc oldSetm=pSetm;
   pCompProc oldComp0=pComp0;
- 
+
   if ((currRing->order[0]==ringorder_dp)
   &&  (currRing->order[1]==ringorder_C)
@@ -2684 +2684 @@
     rChangeCurrRing(&tmpR, TRUE);
   }
-#if ! defined(HAVE_SY_VECTOR) || defined(SY_VEC_DEBUG)  
+#if ! defined(HAVE_SY_VECTOR) || defined(SY_VEC_DEBUG)
   pSetm =syzSetm;
 #endif
@@ -2808 +2808 @@
   ring origR = currRing;
 
-  if ((idIs0(arg)) || 
+  if ((idIs0(arg)) ||
       ((idRankFreeModule(arg)>0) && (!idHomModule(arg,NULL,&(syzstr->cw)))))
   {
@@ -2833 +2833 @@
   {
     ord=NULL;
-  }  
+  }
 /*--- changes to a dpC-ring with special comp0------*/
   else
@@ -2851 +2851 @@
     //pChangeRing(pVariables,1,ord,b0,b1,currRing->wvhdl);
     rChangeCurrRing(&tmpR, TRUE);
-  }  
+  }
 /*--- initializes the data structures---------------*/
   syzstr->Tl = new intvec(*length);
@@ -2858 +2858 @@
   {
     temp->m[i] = pOrdPolyInsertSetm(pCopy(arg->m[i]));
-    if (temp->m[i]!=NULL) 
+    if (temp->m[i]!=NULL)
     {
       j = pTotaldegree(temp->m[i]);
@@ -2870 +2870 @@
   binomials = (int*)Alloc(pVariables*(highdeg+1)*sizeof(int));
   syBinomSet();
-#if ! defined(HAVE_SY_VECTOR) || defined(SY_VEC_DEBUG)  
+#if ! defined(HAVE_SY_VECTOR) || defined(SY_VEC_DEBUG)
   pSetm =syzSetm;
   for (i=0;i<IDELEMS(temp);i++)
@@ -2905 +2905 @@
   nextPairs = syChosePairs(syzstr,&index,&howmuch,&actdeg);
   //if (TEST_OPT_PROT) Print("(%d,%d)",howmuch,index);
-/*--- computes the resolution ----------------------*/ 
+/*--- computes the resolution ----------------------*/
   while (nextPairs!=NULL)
   {
@@ -2923 +2923 @@
     else
       syRedGenerOfCurrDeg(syzstr,actdeg,index+1);
-/*--- creates new pairs -----------------------------*/      
+/*--- creates new pairs -----------------------------*/
     syCreateNewPairs(syzstr,index,i);
-    if (index<(*length)-1) 
+    if (index<(*length)-1)
     {
       syCreateNewPairs(syzstr,index+1,j);
@@ -2953 +2953 @@
     Free((ADDRESS)b0,3*sizeof(int));
     Free((ADDRESS)b1,3*sizeof(int));
-  }  
+  }
   syzstr->binom = binomials;
   syzstr->highdeg_1 = highdeg_1;

Singular/tesths.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tesths.cc,v 1.51 1998-08-03 16:39:34 Singular Exp $ */
+/* $Id: tesths.cc,v 1.52 1998-09-22 14:09:05 Singular Exp $ */
 
 /*
@@ -278 +278 @@
   ttGen2();
 #else
-  int i;
   thisfile = argv[0];
   BOOLEAN load_std_lib=TRUE;
@@ -297 +296 @@
     switch(optc)
     {
-   
+
         case 'b':
-#ifdef HAVE_MPSR   
+#ifdef HAVE_MPSR
           feBatch=TRUE;
           mainSetSingOptionValue(LON_BATCH, (char*) 1);
@@ -339 +338 @@
           tclmode = TRUE;
           mainSetSingOptionValue(LON_TCLMODE, (char*) 1);
-          verbose|=Sy_bit(V_SHOW_MEM);
+          verbose|=Sy_bit(V_SHOW_MEM);
           break;
 #else
@@ -378 +377 @@
           mainSetSingOptionValue(LON_EXECUTE, optarg);
           break;
-   
+
         case 'r':
           errno = 0;
@@ -398 +397 @@
           mainSetSingOptionValue(LON_RANDOM, optarg);
           break;
-   
+
         case 'u':
           mainSetSingOptionValue(LON_USER_OPTION, optarg);
@@ -436 +435 @@
             mainSetSingOptionValue(LON_MP_HOST, optarg);
           }
-#endif   
+#endif
           else if (strcmp(longopts[option_index].name, LON_TICKS_PER_SEC) == 0)
           {
@@ -507 +506 @@
   errorreported = 0;
 #ifndef macintosh
-#if defined(HAVE_FEREAD) || defined(HAVE_READLINE)
+#if defined(HAVE_READLINE)
   fe_set_input_mode();
 #endif