Changeset 265aa7 in git for libfac/factor

Timestamp:

May 22, 2007, 4:49:52 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

44d6cf799fbfac8d0bd66c4ac5bf79e9784d726d

Parents:

17b2e2103b1022a527607ac5bd1c2c0655100596

Message:

*hannes: format


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

File:

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

libfac/factor/Factor.cc

@@ -1 +1 @@
 /* Copyright 1996 Michael Messollen. All rights reserved. */
 ///////////////////////////////////////////////////////////////////////////////
-static char * rcsid = "$Id: Factor.cc,v 1.30 2007-05-22 14:30:53 Singular Exp $ ";
+static char * rcsid = "$Id: Factor.cc,v 1.31 2007-05-22 14:49:52 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.";
 ///////////////////////////////////////////////////////////////////////////////
@@ -210 +210 @@
 ///////////////////////////////////////////////////////////////
 static CFFList
-not_monic( const CFFList & TheList, const CanonicalForm & ltt, const CanonicalForm & F, int levelF){
+not_monic( const CFFList & TheList, const CanonicalForm & ltt, const CanonicalForm & F, int levelF)
+{
   CFFList Returnlist,IntermediateList;
   CFFListIterator i;
@@ -219 +220 @@
 
   if ( lt == lt.genOne() ) return TheList; // the poly was already monic
-  if ( TheList.length() <= 1 ){ // only one factor to substitute back
+  if ( TheList.length() <= 1 ) // only one factor to substitute back
+  {
     if ( totaldegree(lt) == 0 ) // lt is type numeric
       Returnlist.append( CFFactor(lt*TheList.getFirst().factor(),
                                   TheList.getFirst().exp()) );
-    else {
+    else
+    {
       intermediate = F(x*lt, levelF)/power(lt,degree(F,levelF)-1);
       Returnlist.append(CFFactor(intermediate,TheList.getFirst().exp()));
     }
   }
-  else { // more then one factor
+  else // more then one factor
+  {
     IntermediateList= TheList;
     if ( totaldegree(lt) == 0 ){ // lt is type numeric;(SqrFree-use, see above)
@@ -236 +240 @@
       Returnlist= Union(Returnlist,IntermediateList);
     }
-    else{ // lt is a) a product or b) a sum of terms
-      if ( lt_is_product(lt) ){ // case a)
+    else // lt is a) a product or b) a sum of terms
+    {
+      if ( lt_is_product(lt) ) // case a)
+      {
         DEBOUTLN(CERR, "lt_is_product: ", lt);
         savelc= content(lt) ; // can we simplify to savelc= lc(lt); ?
         while ( getNumVars(savelc) != 0 )
           savelc= content(savelc);
-        for ( i=TheList; i.hasItem();i++ ){
+        for ( i=TheList; i.hasItem();i++ )
+        {
           numerator= i.getItem().factor();
           numerator= numerator(x*lt,levelF); // x <- x*lt
@@ -259 +266 @@
           intermediate*= j.getItem().factor();
         test1= mydivremt( intermediate,F,a,b);
-        if ( test1 && b == intermediate.genZero() ) { // Yupp!
+        if ( test1 && b == intermediate.genZero() ) // Yupp!
+        {
           IntermediateList.append(CFFactor(1/a,1));
           Returnlist= IntermediateList;
@@ -265 +273 @@
         else { Returnlist= IntermediateList; }
       }
-      else{ // case b)
+      else // case b)
+      {
         DEBOUTLN(CERR, "lt_is_sum: ", lt);
         CanonicalForm save_denumerator= 1;
-        for ( i=TheList; i.hasItem(); i++ ){
+        for ( i=TheList; i.hasItem(); i++ )
+        {
           numerator= i.getItem().factor();
           numerator= numerator(x*lt,levelF); // x <- x*lt
@@ -274 +284 @@
           test= content(numerator,x);
           test1= mydivremt(denumerator,test,a,b);
-          if ( test1 && b == numerator.genZero() ){ // Yupp!
+          if ( test1 && b == numerator.genZero() ) // Yupp!
+          {
             save_denumerator*= a;
             Returnlist.append(CFFactor(numerator/test ,1));
           }
-          else {
+          else
+          {
 #ifdef HAVE_SINGULAR_ERROR
             WerrorS("libfac: ERROR: not_monic1: case lt is a sum.");
@@ -297 +309 @@
           // the following will do what we want
           Returnlist= myUnion( CFFList(CFFactor(1/a,1)),Returnlist) ;
-        else {
+        else
+        {
 #ifdef HAVE_SINGULAR_ERROR
           WerrorS("libfac: ERROR: not_monic2: case lt is a sum.");
@@ -1334 +1347 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.30  2007/05/22 14:30:53  Singular
+*hannes: diophant_error
+
 Revision 1.29  2007/05/22 13:18:57  Singular
 *hannes: Factorize2: div test, sort etc.