Changeset 3a8520 in git

Timestamp:

Feb 26, 2009, 12:24:15 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

ec4a2c9179673f1cdc6b166e3d74834cf0f12cad

Parents:

60933487e53ddb20e0e5d7d5ccc137ac53893f37

Message:

*hannes: pContentRat


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

Location:

kernel

Files:

• polys1.cc (modified) (3 diffs)
• ratgring.cc (modified) (3 diffs)

kernel/polys1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys1.cc,v 1.33 2009-02-26 11:14:16 levandov Exp $ */
+/* $Id: polys1.cc,v 1.34 2009-02-26 11:24:15 Singular Exp $ */
 
 /*
@@ -1053 +1053 @@
     if (h!=NULL) nDelete(&h);
   
+    pContent(ph);
 #ifdef HAVE_RATGRING
     if (rIsRatGRing(currRing))
@@ -1058 +1059 @@
       pContentRat(ph);
     }
-    else
 #endif
-      pContent(ph);
   }
 }

kernel/ratgring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: ratgring.cc,v 1.18 2009-02-26 11:14:16 levandov Exp $
+ *  Version: $Id: ratgring.cc,v 1.19 2009-02-26 11:24:15 Singular Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -701 +701 @@
   poly p = pCopy(ph); // ph will be needed below
   int HasConstantCoef = 0;
-  int mintdeg = pTotaldegree(p);
-  int minlen = len;
   int is = currRing->real_var_start - 1;
   while (p!=NULL)
@@ -724 +722 @@
   // look for 1 element of minimal degree and of minimal length
   k--;
+  if (k<=0) // this poly is not a ratgring poly -> pContent
+  {
+    pDelete(&C[0]);
+    pDelete(&LM[0]);
+    pContent(ph);
+    goto cleanup;
+  }
+  int mintdeg = pTotaldegree(p);
   int dd = 0; int i;
+  int minlen = len;
   int mindeglen = len;
   int pmindeglen;