Changeset b6249e in git

Timestamp:

Aug 22, 2001, 4:21:17 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

72a88c4530caa33c125d6c39f6a6d78f00065e02

Parents:

28ffaa839e0746a838155fb491e13df051251c68

Message:

*hannes: added search for main var to Factorize


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

Location:

libfac/factor

Files:

• Factor.cc (modified) (5 diffs)
• MVMultiHensel.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.10 2001-08-08 14:26:55 Singular Exp $ ";
+static char * rcsid = "$Id: Factor.cc,v 1.11 2001-08-22 14:21:16 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.";
 ///////////////////////////////////////////////////////////////////////////////
@@ -726 +726 @@
 //           * ensuring poly is sqrfree (n.y.i.)             //
 ///////////////////////////////////////////////////////////////
+int find_mvar(const CanonicalForm &f);
 CFFList
-Factorize( const CanonicalForm & F, int is_SqrFree ){
+Factorize(const CanonicalForm & F, int is_SqrFree ){
   CFFList Outputlist,SqrFreeList,Intermediatelist,Outputlist2;
   ListIterator<CFFactor> i,j;
@@ -756 +757 @@
   }
   TIMING_START(factorize_time);
+  // search an "optimal" main variavble
+  int mv=F.level();
+  if (! F.isUnivariate() )
+  {
+     mv=find_mvar(F);
+     if (mv!=F.level())
+     {
+       swapvar(F,Variable(mv),F.mvar());
+     }
+  }
+
   ///////
   // Maybe it`s better to add a sqrfree-test before?
@@ -829 +841 @@
   Outputlist2.insert(CFFactor(r,1));
 
+  if ((mv!=F.level()) && (! F.isUnivariate() ))
+  {
+    CFFListIterator J=Outputlist2;
+    for ( ; J.hasItem(); J++)
+    {
+      swapvar(J.getItem().factor(),Variable(mv),F.mvar());
+    }
+    swapvar(F,Variable(mv),F.mvar());
+  }
+                                                                                         
   DEBDECLEVEL(cout, "Factorize");
   TIMING_END(factorize_time);
@@ -843 +865 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.10  2001/08/08 14:26:55  Singular
+*hannes: Dan's HAVE_SINGULAR_ERROR
+
 Revision 1.9  2001/08/08 11:59:12  Singular
 *hannes: Dan's NOSTREAMIO changes

libfac/factor/MVMultiHensel.cc

@@ -2 +2 @@
 ///////////////////////////////////////////////////////////////////////////////
 // emacs edit mode for this file is -*- C++ -*-
-// static char * rcsid = "$Id: MVMultiHensel.cc,v 1.6 2001-08-08 14:26:55 Singular Exp $";
+// static char * rcsid = "$Id: MVMultiHensel.cc,v 1.7 2001-08-22 14:21:17 Singular Exp $";
 ///////////////////////////////////////////////////////////////////////////////
 // FACTORY - Includes
@@ -112 +112 @@
   // Degrees ok? degree(F1,mainvar) + degree(F2,mainvar) <= i ?
   if ( (degree(F1,levelU) + degree(F2,levelU) ) <= i ) {
-#ifdef factor/MVMultiHensel.cc
+#ifdef HAVE_SINGULAR_ERROR
     WerrorS("libfac: diophant ERROR: degree too large!  ");
 #else
@@ -411 +411 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.6  2001/08/08 14:26:55  Singular
+*hannes: Dan's HAVE_SINGULAR_ERROR
+
 Revision 1.5  2001/08/08 11:59:12  Singular
 *hannes: Dan's NOSTREAMIO changes