Changeset 32c4523 in git for kernel

Timestamp:

Jul 8, 2008, 1:28:21 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

ce8fc75b7c9fd0e9a6b4fe7bfdf8c2c8926941d0

Parents:

77987005e6c432b32a83558af620b8a21ecaa8cc

Message:

*hannes: syntax


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

Location:

kernel

Files:

• gring.cc (modified) (3 diffs)
• ring.cc (modified) (2 diffs)
• sca.h (modified) (10 diffs)
• weight.cc (modified) (2 diffs)

kernel/gring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: gring.cc,v 1.59 2008-07-04 14:21:53 motsak Exp $
+ *  Version: $Id: gring.cc,v 1.60 2008-07-08 11:28:21 Singular Exp $
  *******************************************************************/
 
@@ -1644 +1644 @@
 #endif
 
-#endif
 
   M2=p_Add_q(M1,M2,r);                             // M1 is killed, M2 = spoly(lt(p1), lt(p2)) = C2*M1 - C1*M2
@@ -3725 +3724 @@
 //   return(TRUE);
 // }
+#endif

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.95 2008-07-07 12:21:43 wienand Exp $ */
+/* $Id: ring.cc,v 1.96 2008-07-08 11:26:50 Singular Exp $ */
 
 /*
@@ -4542 +4542 @@
   {
     idDelete(&(r->qideal));
+#ifdef HAVE_PLURAL
     r->qideal = idOppose(src, src->qideal);
+#else
+    r->qideal = idCopy( src->qideal);
+#endif
+
 
 #ifdef HAVE_PLURAL

kernel/sca.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sca.h,v 1.13 2008-06-26 18:35:45 motsak Exp $ */
+/* $Id: sca.h,v 1.14 2008-07-08 11:26:50 Singular Exp $ */
 
 #include <ring.h>
@@ -24 +24 @@
 
 
+#ifdef HAVE_PLURAL
 // we must always have this test!
 inline ideal SCAQuotient(const ring r)
@@ -31 +32 @@
 }
 
-
-#ifdef HAVE_PLURAL
 #include <gring.h>
 
@@ -86 +85 @@
 // tests whether p is bi-homogeneous with respect to the given variable'(component')-weights
 // ps: polynomial is bi-homogeneous iff all terms have the same bi-degree (x,y).
-bool p_IsBiHomogeneous(const poly p, 
-  const intvec *wx, const intvec *wy, 
-  const intvec *wCx, const intvec *wCy, 
+bool p_IsBiHomogeneous(const poly p,
+  const intvec *wx, const intvec *wy,
+  const intvec *wCx, const intvec *wCy,
   int &dx, int &dy,
   const ring r);
-  
-    
+
+
 //////////////////////////////////////////////////////////////////////////////////////
 
 // tests whether p is bi-homogeneous with respect to the given variable'(component')-weights
 // ps: ideal is bi-homogeneous iff all its generators are bi-homogeneous polynomials.
-bool id_IsBiHomogeneous(const ideal id, 
-  const intvec *wx, const intvec *wy, 
+bool id_IsBiHomogeneous(const ideal id,
+  const intvec *wx, const intvec *wy,
   const intvec *wCx, const intvec *wCy,
   const ring r);
@@ -118 +117 @@
 
 
-inline bool p_IsSCAHomogeneous(const poly p, 
+inline bool p_IsSCAHomogeneous(const poly p,
   const intvec *wCx, const intvec *wCy,
   const ring r)
@@ -125 +124 @@
   intvec *wx = ivGetSCAXVarWeights(r);
   intvec *wy = ivGetSCAYVarWeights(r);
-  
+
   int x,y;
 
   bool homog = p_IsBiHomogeneous( p, wx, wy, wCx, wCy, x, y, r );
-  
+
   delete wx;
   delete wy;
-  
-  return homog;  
+
+  return homog;
 }
 
 
-inline bool id_IsSCAHomogeneous(const ideal id, 
+inline bool id_IsSCAHomogeneous(const ideal id,
   const intvec *wCx, const intvec *wCy,
   const ring r)
@@ -146 +145 @@
 
   bool homog = id_IsBiHomogeneous( id, wx, wy, wCx, wCy, r );
-  
+
   delete wx;
   delete wy;
-  
-  return homog;  
+
+  return homog;
 }
 
@@ -157 +156 @@
 
 // reduce polynomial p modulo <y_i^2> , i = iFirstAltVar .. iLastAltVar
-poly p_KillSquares(const poly p, 
-  const unsigned int iFirstAltVar, const unsigned int iLastAltVar, 
-  const ring r); 
+poly p_KillSquares(const poly p,
+  const unsigned int iFirstAltVar, const unsigned int iLastAltVar,
+  const ring r);
 
 //////////////////////////////////////////////////////////////////////////////////////
 
 // reduce ideal id modulo <y_i^2> , i = iFirstAltVar .. iLastAltVar
-ideal id_KillSquares(const ideal id, 
-  const unsigned int iFirstAltVar, const unsigned int iLastAltVar, 
-  const ring r); 
+ideal id_KillSquares(const ideal id,
+  const unsigned int iFirstAltVar, const unsigned int iLastAltVar,
+  const ring r);
 
 // for benchmarking
@@ -176 +175 @@
 // should be used only inside nc_SetupQuotient!
 // Check whether this our case:
-//  1. rG is  a commutative polynomial ring \otimes anticommutative algebra 
+//  1. rG is  a commutative polynomial ring \otimes anticommutative algebra
 //  2. factor ideal rGR->qideal contains squares of all alternating variables.
-// 
+//
 // if yes, make rGR a super-commutative algebra!
 // NOTE: Factors of SuperCommutative Algebras are supported this way!
@@ -194 +193 @@
 
 #else
-// these must not be used at all. 
+// these must not be used at all.
 // #define scaFirstAltVar(R) 0
 // #define scaLastAltVar(R) 0

kernel/weight.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: weight.cc,v 1.5 2008-05-09 09:23:59 Singular Exp $ */
+/* $Id: weight.cc,v 1.6 2008-07-08 11:26:50 Singular Exp $ */
 
 /*
@@ -16 +16 @@
 #include "febase.h"
 #include "ideals.h"
+#include "ring.h"
 #include "weight.h"