Changeset 6036eb2 in git

Timestamp:

Oct 17, 2005, 3:17:39 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5c4b32bd48cf1a43b48494ed08ee1b3140875ccb

Parents:

3e27a59011737f22d803246d84f20a7d39e48e3b

Message:

*hannes: aplly sqrFree before newfactoras (Factorize in Q(a))


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

File:

• libfac/factor/Factor.cc (modified) (3 diffs)

libfac/factor/Factor.cc

@@ -1 +1 @@
 /* Copyright 1996 Michael Messollen. All rights reserved. */
 ///////////////////////////////////////////////////////////////////////////////
-static char * rcsid = "$Id: Factor.cc,v 1.17 2004-12-10 10:15:06 Singular Exp $ ";
+static char * rcsid = "$Id: Factor.cc,v 1.18 2005-10-17 13:17:39 Singular Exp $ ";
 static char * errmsg = "\nYou found a bug!\nPlease inform (Michael Messollen) michael@math.uni-sb.de \nPlease include above information and your input (the ideal/polynomial and characteristic) in your bug-report.\nThank you.";
 ///////////////////////////////////////////////////////////////////////////////
@@ -971 +971 @@
     {
       CFList as(minpoly);
-      Outputlist = newfactoras( F, as, 1);
+      CFFList sqF=sqrFree(F); // sqrFreeZ
+      CFFList G,H;
+      CanonicalForm fac;
+      int d;
+      ListIterator<CFFactor> i,k;
+      for ( i = sqF; i.hasItem(); ++i ) 
+      {
+        d = i.getItem().exp();
+        fac = i.getItem().factor();
+        G = newfactoras( fac, as, 1);
+        for ( k = G; k.hasItem(); ++k )
+        {
+          fac = k.getItem().factor();
+          int dd = k.getItem().exp();
+          H.append( CFFactor( fac , d*dd ) );
+        }
+      }
+      //Outputlist = newfactoras( F, as, 1);
+      Outputlist = H;
     }
     else
@@ -1097 +1115 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.17  2004/12/10 10:15:06  Singular
+*pohl: AlgExtGenerator etc.
+
 Revision 1.16  2003/05/28 11:52:52  Singular
 *pfister/hannes: newfactoras, alg_gcd, divide (see bug_33)