Changeset 7164b40 in git

Timestamp:

Jan 19, 2002, 1:26:02 PM (22 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')

Children:

cb7578a9034f20d08a92cd05938a6eb9b7ce86ed

Parents:

a9256747eae039136ca8aa9de4dabf605eb86355

Message:

+ corrected maEggT


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

File:

• Singular/fast_maps.cc (modified) (3 diffs)

Singular/fast_maps.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 02/01
- *  Version: $Id: fast_maps.cc,v 1.5 2002-01-19 10:58:42 obachman Exp $
+ *  Version: $Id: fast_maps.cc,v 1.6 2002-01-19 12:26:02 bricken Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -290 +290 @@
 // return NULL if deg(ggt(m1, m2)) < 2
 // else return m = ggT(m1, m2) and q1, q2 such that m1 = q1*m m2 = q2*m
+
 static poly maEggT(const poly m1, const poly m2, poly &q1, poly &q2,const ring r)
 {
+
   int i;
   int dg = 0;
   poly ggt = NULL;
-  for (i=1; i<=r->N; i++)
-  {
+  q1 = p_Init(r);
+  q2 = p_Init(r);
+  ggt=p_Init(r);
+
+  for (i=1;i<=r->N;i++) {
     Exponent_t e1 = p_GetExp(m1, i, r);
     Exponent_t e2 = p_GetExp(m2, i, r);
-    if (e1 > 0 && e2 > 0)
-    {
+    if (e1 > 0 && e2 > 0){
       Exponent_t em = (e1 > e2 ? e2 : e1);
-      if (dg < 2)
-      {
-        ggt = p_Init(r);
-        q1 = p_Init(r);
-        q2 = p_Init(r);
-      }
       dg += em;
       p_SetExp(ggt, i, em, r);
@@ -313 +311 @@
       p_SetExp(q2, i, e2 - em, r);
     }
-  }
-  if (ggt != NULL)
+    else {
+      p_SetExp(q1, i, e1, r);
+      p_SetExp(q2, i, e2, r);
+    }
+  }
+  if (dg>1)
   {
     p_Setm(ggt, r);
     p_Setm(q1, r);
     p_Setm(q2, r);
+
+    
+  }
+  else {
+    p_LmFree(ggt, r);
+    p_LmFree(q1, r);
+    p_LmFree(q2, r);
+    ggt = NULL;
   }
   return ggt;
 }
+
+
 
 /*******************************************************************************