Changeset ee586a in git

Timestamp:

Jun 1, 2008, 7:49:05 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

f2b58394b7c0b28984794adfcef85f56f72e35bf

Parents:

0b85fcff1722325fd8010e4185d911f83cd46c04

Message:

*hannes: sqrfree etc


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

Files:

• factory/fac_sqrfree.cc (modified) (4 diffs)
• libfac/charset/charset.cc (modified) (4 diffs)
• libfac/factor/Factor.cc (modified) (4 diffs)
• libfac/factor/SqrFree.cc (modified) (6 diffs)

factory/fac_sqrfree.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: fac_sqrfree.cc,v 1.11 2008-05-31 17:21:11 Singular Exp $ */
+/* $Id: fac_sqrfree.cc,v 1.12 2008-06-01 17:49:05 Singular Exp $ */
 
 #include <config.h>
@@ -115 +115 @@
     CFFList F;
 
-    while ( ! c.degree() == 0 ) {
+    while ( ! c.degree() == 0 )
+    {
         y = gcd( w, c ); z = w / y;
         if ( degree( z ) > 0 )
@@ -145 +146 @@
     CFFList F;
     Variable v = aa.mvar();
-    while ( ! c.degree(v) == 0 ) {
+    while ( ! c.degree(v) == 0 )
+    {
         y = gcd( w, c ); z = w / y;
         if ( degree( z, v ) > 0 )
@@ -162 +164 @@
     if ( ! cont.isOne() )
         F = Union( F, sqrFreeZ( cont ) );
-    if ( lc( a ).sign() < 0 ) {
-        if ( F.getFirst().exp() == 1 ) {
+    if ( lc( a ).sign() < 0 )
+    {
+        if ( F.getFirst().exp() == 1 )
+        {
             CanonicalForm f = F.getFirst().factor();
             CFFListIterator(F).getItem() = CFFactor( -f, 1 );

libfac/charset/charset.cc

@@ -2 +2 @@
 ////////////////////////////////////////////////////////////
 // emacs edit mode for this file is -*- C++ -*-
-/* $Id: charset.cc,v 1.15 2008-05-31 17:20:10 Singular Exp $ */
+/* $Id: charset.cc,v 1.16 2008-06-01 17:48:13 Singular Exp $ */
 /////////////////////////////////////////////////////////////
 // FACTORY - Includes
@@ -547 +547 @@
     if ( degree(elem) > 1 ) // linear poly's are irreduzible
     {
-      //qs = Factorize2(elem,CanonicalForm(0));
       qs = Factorize(elem);
       // remove a constant
@@ -587 +586 @@
         {  // search for a non linear elem
           elem=i.getItem();
-          if (as.length()==1)
-            qs = Factorize2(elem,as.getFirst());
-          else
+          //if (as.length()==1)
+          //  qs = Factorize2(elem,as.getFirst());
+          //else
             qs= newfactoras(elem,as,success);
           if ( qs.length() > 1 || qs.getFirst().exp() > 1 )
@@ -609 +608 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.15  2008/05/31 17:20:10  Singular
+hannes: minor irras changes
+
 Revision 1.14  2008/04/08 16:19:09  Singular
 *hannes: removed rcsid

libfac/factor/Factor.cc

@@ -1 +1 @@
 /* Copyright 1996 Michael Messollen. All rights reserved. */
 ///////////////////////////////////////////////////////////////////////////////
-/* $Id: Factor.cc,v 1.46 2008-05-31 17:20:10 Singular Exp $ */
+/* $Id: Factor.cc,v 1.47 2008-06-01 17:48:14 Singular Exp $ */
 static const char * errmsg = "\nYou found a bug!\nPlease inform singular@mathematik.uni-kl.de\nPlease include above information and your input (the ideal/polynomial and characteristic) in your bug-report.\nThank you.";
 ///////////////////////////////////////////////////////////////////////////////
@@ -880 +880 @@
 CFFList Factorize(const CanonicalForm & F, int is_SqrFree )
 {
-  out_cf("Factorize ",F,"\n");
+  //out_cf("Factorize ",F,"\n");
   CFFList Outputlist,SqrFreeList,Intermediatelist,Outputlist2;
   ListIterator<CFFactor> i,j;
@@ -954 +954 @@
       if ( g.isUnivariate() )
       {
-        out_cf("univ. poly: ",g,"\n");
+        //out_cf("univ. poly: ",g,"\n");
         Intermediatelist=factorize(g,1); // poly is sqr-free!
         for ( j=Intermediatelist; j.hasItem(); j++ )
@@ -1335 +1335 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.46  2008/05/31 17:20:10  Singular
+hannes: minor irras changes
+
 Revision 1.45  2008/04/08 16:19:10  Singular
 *hannes: removed rcsid

libfac/factor/SqrFree.cc

@@ -2 +2 @@
 ///////////////////////////////////////////////////////////////////////////////
 // emacs edit mode for this file is -*- C++ -*-
-/* $Id: SqrFree.cc,v 1.21 2008-05-31 17:20:10 Singular Exp $ */
+/* $Id: SqrFree.cc,v 1.22 2008-06-01 17:48:14 Singular Exp $ */
 static const char * errmsg = "\nYou found a bug!\nPlease inform singular@mathematik.uni-kl.de\n Please include above information and your input (the ideal/polynomial and characteristic) in your bug-report.\nThank you.";
 ///////////////////////////////////////////////////////////////////////////////
@@ -150 +150 @@
 
   if (getNumVars(f)==0) return 1 ; // a constant is SqrFree
-  if ( f.isUnivariate() ) {
+  if ( f.isUnivariate() )
+  {
     g= f.deriv();
     if ( getCharacteristic() > 0 && g.isZero() ) return 0 ;
@@ -224 +225 @@
   if (getNumVars(f)==0 )
   { // just a constant; return it
-    Outputlist= myappend(Outputlist,CFFactor(f,1));
+    Outputlist= CFFactor(f,1);
     return Outputlist ;
   }
@@ -235 +236 @@
     {
       g = swapvar(f,k,n); g = content(g);
-      if ( ! (g.isOne() || (-g).isOne() || degree(g)==0 ))
+      if ( ! (g.isOne() || (-g).isOne() || (degree(g)==0) ))
       {
         g = swapvar(g,k,n);
@@ -325 +326 @@
     f /= h; // Now we have split the poly into f and h
     g = lc(f);
-    if ( g != f.genOne() && getNumVars(g) == 0 )
+    if ( !g.isOne() && getNumVars(g) == 0 )
     {
        Outputlist= myappend(Outputlist,CFFactor(g,1)) ;
@@ -455 +456 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.21  2008/05/31 17:20:10  Singular
+hannes: minor irras changes
+
 Revision 1.20  2008/05/14 12:38:26  Singular
 *hannes: swapvar ->replacevar