Changeset 26d633 in git

Timestamp:

Feb 24, 2009, 6:40:28 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

7012d0f08e30c9406b7eb002fa6bd6b55e8cd1cd

Parents:

b35f71c1b167b8be236dfa80369381a582f6cfe5

Message:

*hannes: syntax fix


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

Location:

kernel

Files:

• gr_kstd2.cc (modified) (3 diffs)
• gring.cc (modified) (20 diffs)

kernel/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.29 2009-02-23 19:22:27 levandov Exp $ */
+/* $Id: gr_kstd2.cc,v 1.30 2009-02-24 17:40:28 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
@@ -1123 +1123 @@
 //        }
 
-      
+
       if( ! rIsRatGRing(currRing) )
-      { 
+      {
         strat->P.p = nc_CreateSpoly(strat->P.p1,strat->P.p2,currRing);
       }
+#ifdef HAVE_RATGRING
       else
       {
@@ -1133 +1134 @@
         strat->P.p = nc_rat_CreateSpoly(strat->P.p1,strat->P.p2,currRing->real_var_start-1,currRing);
       }
+#endif
 
 

kernel/gring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: gring.cc,v 1.69 2009-02-23 19:22:27 levandov Exp $
+ *  Version: $Id: gring.cc,v 1.70 2009-02-24 17:40:28 Singular Exp $
  *******************************************************************/
 
@@ -249 +249 @@
   rTest(rRing);
 #endif
-  
+
   int lp, lq;
 
@@ -257 +257 @@
 
   CPolynomialSummator sum(rRing, bUsePolynomial);
-  
+
   if (lq <= lp) // ?
   {
@@ -308 +308 @@
       sum += nc_mm_Mult_pp( p, pPolyQ, rRing);
   }
-  
+
   return(sum);
 }
@@ -775 +775 @@
   int *Nxt=(int*)omAlloc0((rN+1)*sizeof(int));
   int *lF=(int *)omAlloc0((rN+1)*sizeof(int));
-  
+
   int cnt=0; int cnf=0;
   /* splitting F wrt jG */
@@ -783 +783 @@
     if (F[i]!=0) cnf++;
   }
-  
+
   if (cnf==0)
   {
     freeT(Prv,rN); Prv = NULL;
   }
-  
+
   for (i=jG+1;i<=rN;i++)
   {
@@ -817 +817 @@
        p_Test(Rout,r);
 #endif
-       
+
        freeT(Prv,rN);
        Prv = NULL;
-       
+
        out=gnc_mm_Mult_p(Rout,out,r); /* getting the final result */
     }
@@ -826 +826 @@
     freeT(lF,rN);
     lF = NULL;
-    
+
     p_Delete(&Rout,r);
 
@@ -832 +832 @@
     assume(lF == NULL);
     assume(Prv == NULL);
-    
+
     return (out);
   }
@@ -955 +955 @@
     p_Delete(&Rout,r);
   }
-  
+
   return (out);
 }
@@ -1011 +1011 @@
   p_Delete(&y,r);
   //  t=MATELEM(cMT,a,b);
-  t= nc_p_CopyGet(MATELEM(cMT,a,b),r); 
+  t= nc_p_CopyGet(MATELEM(cMT,a,b),r);
   //  return(p_Copy(t,r));
   /* since the last computed element was cMT[a,b] */
@@ -1022 +1022 @@
   if(bNoFormula)
     return gnc_uu_Mult_ww_vert(i, a, j, b, r);
-  
+
   CFormulaPowerMultiplier* FormulaMultiplier = GetFormulaPowerMultiplier(r);
   Enum_ncSAType PairType = _ncSA_notImplemented;
-  
+
   if( FormulaMultiplier != NULL )
     PairType = FormulaMultiplier->GetPair(j, i);
-   
+
 
   if( PairType == _ncSA_notImplemented )
     return gnc_uu_Mult_ww_vert(i, a, j, b, r);
 
-  
+
  //    return FormulaMultiplier->Multiply(j, i, b, a);
   poly t = CFormulaPowerMultiplier::Multiply( PairType, j, i, b, a, r);
-  
+
   int rN=r->N;
   matrix cMT = r->GetNC()->MT[UPMATELEM(j,i,rN)];         /* cMT=current MT */
@@ -1042 +1042 @@
 
   MATELEM(cMT, a, b) = nc_p_CopyPut(t,r);
-  
+
   //  t=MATELEM(cMT,a,b);
 //  t= nc_p_CopyGet(MATELEM(cMT,a,b),r);
@@ -1102 +1102 @@
   }
 
-  
+
   /* we are here if  i>j and variables do not commute or quasicommute */
   /* in fact, now a>=1 and b>=1; and j<i */
@@ -1900 +1900 @@
   }
 
-  poly m; 
+  poly m;
   if ( ! rIsRatGRing(currRing))
   {
     m = p_Lcm(p1, p2, si_max(lCompP1, lCompP2), r);
   }
+#ifdef HAVE_RATGRING
   else
   {
@@ -1910 +1911 @@
     m = p_LcmRat(p1, p2, si_max(lCompP1, lCompP2), r);
   }
+#endif
 
 //  n_Delete(&p_GetCoeff(m, r), r);
@@ -2248 +2250 @@
 
   CPolynomialSummator sum(currRing, UseBuckets == 0);
-  
+
   while (p!=NULL)
   {
@@ -2663 +2665 @@
     r->GetNC()->GetFormulaPowerMultiplier() = NULL;
   }
-  
-  
+
+
   int i,j;
   int rN=r->N;
@@ -3200 +3202 @@
 bool nc_rCopy(ring res, const ring r, bool bSetupQuotient)
 {
-  if (nc_CallPlural(r->GetNC()->C, r->GetNC()->D, NULL, NULL, res, bSetupQuotient, true, true, r)) 
+  if (nc_CallPlural(r->GetNC()->C, r->GetNC()->D, NULL, NULL, res, bSetupQuotient, true, true, r))
   {
     WarnS("Error occured while coping/setuping the NC structure!"); // No reaction!???
@@ -3309 +3311 @@
   if(!rIsSCA(r) && !bNoFormula)
     ncInitSpecialPowersMultiplication(r);
-  
-  
+
+
   if (save != currRing)
     rChangeCurrRing(save);