Changeset aa7480c in git

Timestamp:

Jan 7, 2008, 2:34:56 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

46f6af6b0ad4f593376191e4bbe9dda46e6d8fae

Parents:

1e6de686866af59b3d97fffef1d92033d15f47c6

Message:

*hannes: omse optiomzations(isOne)


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

Location:

libfac/factor

Files:

• Factor.cc (modified) (13 diffs)
• SqrFree.cc (modified) (3 diffs)
• Truefactor.cc (modified) (13 diffs)

libfac/factor/Factor.cc

@@ -1 +1 @@
 /* Copyright 1996 Michael Messollen. All rights reserved. */
 ///////////////////////////////////////////////////////////////////////////////
-static char * rcsid = "$Id: Factor.cc,v 1.37 2007-10-25 14:45:41 Singular Exp $ ";
+static char * rcsid = "$Id: Factor.cc,v 1.38 2008-01-07 13:34:56 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.";
 ///////////////////////////////////////////////////////////////////////////////
@@ -116 +116 @@
   if ( totaldegree(remlc)==0 ){ remlc=f.genOne() ; }
   DEBOUTLN(CERR, "remlc= " , remlc);
-  for ( int i=n-1; i>=1; i-- ){
+  for ( int i=n-1; i>=1; i-- )
+  {
     newlc= LC(f,i);
     if ( totaldegree(newlc)==0 ){ newlc=f.genOne() ; }
@@ -222 +223 @@
   int test1;
 
-  if ( lt == lt.genOne() ) return TheList; // the poly was already monic
+  if ( lt.isOne() ) return TheList; // the poly was already monic
   if ( TheList.length() <= 1 ) // only one factor to substitute back
   {
@@ -356 +357 @@
 ///////////////////////////////////////////////////////////////
 static int
-various_tests( const CanonicalForm & g, int deg, int vars_left){
+various_tests( const CanonicalForm & g, int deg, int vars_left)
+{
   CFMap m;
 
@@ -362 +364 @@
     if ( level(compress(g,m)) == (vars_left) ) // exactly one variable less
       if ( SqrFreeTest(g,1) ) // poly is sqrfree
-        if ( gcd(g,g.deriv()) == 1 ) // Discriminante != 0
+        if ( gcd(g,g.deriv()).isOne() ) // Discriminante != 0
            return 1;
   return 0;
@@ -579 +581 @@
         unilist = factorize2(g,Extension,mipo);
       }
-      if (unilist.length() <= minfactors ) {
+      if (unilist.length() <= minfactors )
+      {
         minfactors=unilist.length();
         minEvaluation=Substitutionlist;
@@ -586 +589 @@
       else samefactors +=1;
 
-      if (unilist.length() == 1 ){ // wow! we found f is irreducible!
+      if (unilist.length() == 1 ) // wow! we found f is irreducible!
+      {
         BestEvaluationpoint=minEvaluation;
         BestFactorisation=minFactorisation;
@@ -592 +596 @@
       }
 
-      if ( samefactors >= sametries ){ // now we stop ( maybe polynomial *has*
-                                       // minfactors factors? )
+      if ( samefactors >= sametries ) // now we stop ( maybe polynomial *has*
+                                      // minfactors factors? )
+      {
         BestEvaluationpoint=minEvaluation;
         BestFactorisation=minFactorisation;
@@ -600 +605 @@
 
     }
-    else failedfactor += 1;
-
-    if ( failedfactor >= failtries ){ // now we stop ( perhaps Extension isn't
-                                      // big enough )
+    else
+      failedfactor += 1;
+
+    if ( failedfactor >= failtries ) // now we stop ( perhaps Extension isn't
+                                     // big enough )
+    {
       if ( tried == 0 )
         return 0;
-      else{
+      else
+      {
         BestEvaluationpoint=minEvaluation;
         BestFactorisation=minFactorisation;
@@ -612 +620 @@
       }
     }
-
   }
   BestEvaluationpoint=minEvaluation;
@@ -725 +732 @@
   // Check special cases
   for ( int i=1; i<=level(F); i++)
-    if ( degree(f,Variable(i) ) == 1 ) { //test trivial case; only true iff F is primitiv w.r.t every variable; else check (if F=ax+b) gcd(a,b)=1 ?
+  {
+    if ( degree(f,Variable(i) ) == 1 ) 
+    //test trivial case; only true iff F is primitiv w.r.t every variable; else check (if F=ax+b) gcd(a,b)=1 ?
+    {
       DEBOUTLN(CERR, "Trivial case: ", F);
       Outputlist.append(CFFactor(F,1));
       return Outputlist;
     }
+  }
 
   // Look at the leading term:
   lt = LC(f);
   DEBOUTLN(CERR, "Leading term: ", lt);
-  if ( lt != f.genOne() )
+  //if ( lt != f.genOne() )
+  if ( !lt.isOne() )
   {
     // make the polynomial monic in the main variable
@@ -836 +848 @@
     // INTERRUPTHANDLER
 
-    if ( lt != f.genOne() )
+    //if ( lt != f.genOne() )
+    if ( !lt.isOne() )
     {
       Outputlist = not_monic(Outputlist,lt,ff,level(ff));
@@ -1318 +1331 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.37  2007/10/25 14:45:41  Singular
+*hannes: homgfactor for alg.ext of Q
+
 Revision 1.36  2007/10/15 18:03:11  Singular
 *hannes: // debug stuff

libfac/factor/SqrFree.cc

@@ -2 +2 @@
 ///////////////////////////////////////////////////////////////////////////////
 // emacs edit mode for this file is -*- C++ -*-
-static char * rcsid = "$Id: SqrFree.cc,v 1.11 2007-05-15 14:46:49 Singular Exp $";
+static char * rcsid = "$Id: SqrFree.cc,v 1.12 2008-01-07 13:34:56 Singular Exp $";
 static char * errmsg = "\nYou found a bug!\nPlease inform (Michael Messollen) michael@math.uni-sb.de .\n Please include above information and your input (the ideal/polynomial and characteristic) in your bug-report.\nThank you.";
 ///////////////////////////////////////////////////////////////////////////////
@@ -304 +304 @@
     return Outputlist ;
   }
-  else { // we can split into two nontrivial pieces
+  else  // we can split into two nontrivial pieces
+  {
     f /= h; // Now we have split the poly into f and h
     g = lc(f);
-    if ( g != f.genOne() && getNumVars(g) == 0 ){
+    //if ( g != f.genOne() && getNumVars(g) == 0 ){
+    if ( (!g.isOne()) && getNumVars(g) == 0 )
+    {
        Outputlist= myappend(Outputlist,CFFactor(g,1)) ;
        f /= g;
@@ -415 +418 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.11  2007/05/15 14:46:49  Singular
+*hannes: factorize in Zp(a)[x...]
+
 Revision 1.10  2006/05/16 14:46:50  Singular
 *hannes: gcc 4.1 fixes

libfac/factor/Truefactor.cc

@@ -2 +2 @@
 ///////////////////////////////////////////////////////////////////////////////
 // emacs edit mode for this file is -*- C++ -*-
-//static char * rcsid = "@(#) $Id: Truefactor.cc,v 1.10 2006-05-16 14:46:50 Singular Exp $";
+//static char * rcsid = "@(#) $Id: Truefactor.cc,v 1.11 2008-01-07 13:34:56 Singular Exp $";
 ///////////////////////////////////////////////////////////////////////////////
 // Factory - Includes
@@ -278 +278 @@
   onemore=1;
 // steps 3 to 6
-  while (1){
+  while (1)
+  {
     // step 3 iff onemore == 1
     if ( onemore ) M+= 1;  else onemore = 1;
     // step 4
-    if ( U == U.genOne() ) break; // Return FAC
-    if ( ( r == 1 ) || ( M >= ( r-1 ) ) || ( M > degU ) ) {
+    if ( U.isOne() ) break; // Return FAC
+    if ( ( r == 1 ) || ( M >= ( r-1 ) ) || ( M > degU ) )
+    {
       FAC.append( CFFactor(U,1) );
       break; // Return FAC union {U}
@@ -293 +295 @@
     E_all = Rightdegree( E_all, degU, levelU );
     DEBOUTLN(CERR,"Truefactors: (step5) E_all(Rightdegree)= ", E_all);
-    if ( E_all.length() == 0 ){
+    if ( E_all.length() == 0 )
+    {
       FAC.append( CFFactor(U,1) );
       break; // Return FAC union {U}
     }
-    for ( i=E_all; i.hasItem(); i++){
+    for ( i=E_all; i.hasItem(); i++)
+    {
       factor = i.getItem();
       Y = Multmod_power( factor.factor(), SubstitutionList, h, levelU);
@@ -303 +307 @@
       c = mydivremt(U,Y,a,b);
       //      if (  c  && b == U.genZero()) { // Y divides U
-      if ( c && b.isZero() ){
+      if ( c && b.isZero() )
+      {
         DEBOUT(CERR,"Truefactors: (step6): ",Y );
         DEBOUTLN(CERR, "  divides  ",U);
@@ -320 +325 @@
     }
   }
-
   return FAC;
 }
@@ -327 +331 @@
 // Check if poly f is in Fp (returns true) or in Fp(a)       //
 ///////////////////////////////////////////////////////////////
-static bool
-is_in_Fp( const CanonicalForm & f ){
+static bool is_in_Fp( const CanonicalForm & f )
+{
   if ( f.inCoeffDomain() )
     return f.inBaseDomain() ;
-  else {
+  else
+  {
     CFIterator i=f;
     bool ok=true;
-    while ( ok && i.hasTerms() ){
+    while ( ok && i.hasTerms() )
+    {
       ok = is_in_Fp( i.coeff() );
       i++ ;
@@ -348 +354 @@
 // of) multiplying by other elements.                        //
 ///////////////////////////////////////////////////////////////
-CFFList
-TakeNorms(const CFFList & PiList){
+CFFList TakeNorms(const CFFList & PiList)
+{
   CFFList CopyPossibleFactors, PossibleFactors, TrueFactors;
   CFFListIterator i;
@@ -359 +365 @@
 
   // First check if the factors in PiList already lie in Fp-Domain
-  for ( i=PiList; i.hasItem(); i++ ){
+  for ( i=PiList; i.hasItem(); i++ )
+  {
     Factor = i.getItem();
     if ( is_in_Fp( Factor.factor() ) )
@@ -368 +375 @@
   // Now we have to check if combinations of the remaining factors
   // (now in PossibleFactors) do lie in Fp-Domain
-  if ( PossibleFactors.length() > 0 ){ // there are (at least two) items
+  if ( PossibleFactors.length() > 0 ) // there are (at least two) items
+  {
     int n=2;
-    if ( PossibleFactors.length() < n ) { // a little check
+    if ( PossibleFactors.length() < n )  // a little check
+    {
 #ifdef HAVE_SINGULAR_ERROR
       WerrorS("libfac: ERROR: TakeNorms less then two items remaining!");
@@ -382 +391 @@
 #endif
     }
-    while ( n < PossibleFactors.length() ){
+    while ( n < PossibleFactors.length() )
+    {
       // generate all combinations of n elements
       combinat(n, PossibleFactors.length(), CombinatList);
-      for ( j=CombinatList ; j.hasItem(); j++ ){
+      for ( j=CombinatList ; j.hasItem(); j++ )
+      {
         intermediate=1;
         for ( k=j.getItem(); k.hasItem(); k++ )
           intermediate *= getItemNr( k.getItem(), PossibleFactors );
-        if ( is_in_Fp( intermediate ) ){
+        if ( is_in_Fp( intermediate ) )
+        {
           TrueFactors.append(intermediate); // found a true factor
           CopyPossibleFactors=PossibleFactors; // save list
@@ -399 +411 @@
           break;
         }
-        else {
+        else
+        {
           //CERR << "Schade!" << "\n";
         }
@@ -409 +422 @@
   // All remaining factors in PossibleFactors multiplied
   // should lie in Fp domain
-    if ( PossibleFactors.length() >=1 ){
+    if ( PossibleFactors.length() >=1 )
+    {
       for ( i=PossibleFactors; i.hasItem(); i++ )
         intermediate *= i.getItem().factor();
       // a last check:
-      if ( is_in_Fp(intermediate) ){
+      if ( is_in_Fp(intermediate) )
+      {
         TrueFactors.append(CFFactor(intermediate,1));
       }
-      else{
+      else
+      {
 #ifdef HAVE_SINGULAR_ERROR
         WerrorS("libfac: TakeNorms: somethings wrong with remaining factors!");
@@ -434 +450 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.10  2006/05/16 14:46:50  Singular
+*hannes: gcc 4.1 fixes
+
 Revision 1.9  2001/08/08 14:26:56  Singular
 *hannes: Dan's HAVE_SINGULAR_ERROR