Changeset 10697c in git for libfac/factor

Timestamp:

May 15, 2007, 5:50:42 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1591a873ae939d12cc28f2fbb1408a9e8fdad9b8

Parents:

38e7b3ea67100d6b56716b967237bef70ac6adce

Message:

*hannes: Factorize2


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

File:

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

libfac/factor/Factor.cc

@@ -1 +1 @@
 /* Copyright 1996 Michael Messollen. All rights reserved. */
 ///////////////////////////////////////////////////////////////////////////////
-static char * rcsid = "$Id: Factor.cc,v 1.24 2007-05-15 14:46:48 Singular Exp $ ";
+static char * rcsid = "$Id: Factor.cc,v 1.25 2007-05-15 15:50:42 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.";
 ///////////////////////////////////////////////////////////////////////////////
@@ -993 +993 @@
 //           * ensuring poly is sqrfree (n.y.i.)             //
 ///////////////////////////////////////////////////////////////
+CFFList Factorize2(const CanonicalForm & F, const CanonicalForm & minpoly )
+{
+  CFFList iF=Factorize(F);
+  CFFList G,H;
+  CanonicalForm fac;
+  int d;
+  ListIterator<CFFactor> i,k;
+  for ( i = iF; i.hasItem(); ++i )
+  {
+    d = i.getItem().exp();
+    fac = i.getItem().factor();
+    G = Factorize( fac, minpoly);
+    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);
+  return H;
+}
 CFFList
 Factorize(const CanonicalForm & F, const CanonicalForm & minpoly, int is_SqrFree )
@@ -1070 +1092 @@
   ///////
   //  if ( ! SqrFreeTest(F) ){
-  if ( ! is_SqrFree ){
+  if ( ! is_SqrFree )
+  {
     TIMING_START(sqrfree_time);
     SqrFreeList = InternalSqrFree(F, minpoly) ; // first sqrfree the polynomial
@@ -1086 +1109 @@
     SqrFreeList.append(CFFactor(F,1));
   DEBOUTLN(CERR, "InternalSqrFreeList= ", SqrFreeList);
-  for ( i=SqrFreeList; i.hasItem(); i++ ){
+  for ( i=SqrFreeList; i.hasItem(); i++ )
+  {
     DEBOUTLN(CERR, "Factor under consideration: ", i.getItem().factor());
     // We need a compress on each list item ! Maybe we have less variables!
@@ -1094 +1118 @@
       Outputlist.append( CFFactor(g,1) ) ;
     else// a real polynomial
-      if ( g.isUnivariate() ){
+      if ( g.isUnivariate() )
+      {
         Variable alpha=rootOf(minpoly);
         Intermediatelist=factorize2(g,alpha,minpoly); // poly is sqr-free!
@@ -1103 +1128 @@
              exp*j.getItem().exp()));
       }
-      else{ // multivariate polynomial
-        if ( g.isHomogeneous() ){
+      else // multivariate polynomial
+      {
+        if ( g.isHomogeneous() )
+        {
           DEBOUTLN(CERR, "Poly is homogeneous! : ", g);
           // Now we can substitute one variable to 1, factorize and then
@@ -1168 +1195 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.24  2007/05/15 14:46:48  Singular
+*hannes: factorize in Zp(a)[x...]
+
 Revision 1.23  2006/05/16 14:46:49  Singular
 *hannes: gcc 4.1 fixes