Changeset b429551 in git for libfac/charset
- Timestamp:
- Jan 22, 2008, 10:51:37 AM (16 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- f24a7f4cb925cec508572ae72f9bf06624119a14
- Parents:
- 35cfa3461f55f0fe3760bcefda25c627641368c7
- Location:
- libfac/charset
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
libfac/charset/alg_factor.cc
r35cfa3 rb429551 3 3 // emacs edit mode for this file is -*- C++ -*- 4 4 //////////////////////////////////////////////////////////// 5 static char * rcsid = "$Id: alg_factor.cc,v 1.1 7 2007-05-15 14:46:48Singular Exp $";5 static char * rcsid = "$Id: alg_factor.cc,v 1.18 2008-01-22 09:51:36 Singular Exp $"; 6 6 //////////////////////////////////////////////////////////// 7 7 // FACTORY - Includes … … 754 754 Fgcd= pp(Fgcd); Ggcd= pp(Ggcd); 755 755 DEBDECLEVEL(CERR,"newfactoras"); 756 return myUnion(newfactoras(Fgcd,as,success) , newfactoras(Ggcd,as,success));756 return UnionCFFL(newfactoras(Fgcd,as,success) , newfactoras(Ggcd,as,success)); 757 757 } 758 758 if ( getCharacteristic() > 0 ){ … … 823 823 output=newfactoras(i.getItem().factor(),as, success); 824 824 for ( CFFListIterator j=output; j.hasItem(); j++) 825 Output = myappend(Output,CFFactor(j.getItem().factor(),j.getItem().exp()*i.getItem().exp()));825 Output = appendCFFL(Output,CFFactor(j.getItem().factor(),j.getItem().exp()*i.getItem().exp())); 826 826 } 827 827 return Output; … … 830 830 /* 831 831 $Log: not supported by cvs2svn $ 832 Revision 1.17 2007/05/15 14:46:48 Singular 833 *hannes: factorize in Zp(a)[x...] 834 832 835 Revision 1.16 2006/05/16 14:46:48 Singular 833 836 *hannes: gcc 4.1 fixes -
libfac/charset/algfactor.cc
r35cfa3 rb429551 3 3 // emacs edit mode for this file is -*- C++ -*- 4 4 //////////////////////////////////////////////////////////// 5 static char * rcsid = "$Id: algfactor.cc,v 1. 8 2006-06-19 13:37:46Singular Exp $";5 static char * rcsid = "$Id: algfactor.cc,v 1.9 2008-01-22 09:51:37 Singular Exp $"; 6 6 //////////////////////////////////////////////////////////// 7 7 // FACTORY - Includes … … 429 429 success= min(success,csuccess); 430 430 for ( CFFListIterator j=CERR; j.hasItem(); j++) 431 Output = myappend(Output,CFFactor(j.getItem().factor(),j.getItem().exp()*i.getItem().exp()));431 Output = appendCFFL(Output,CFFactor(j.getItem().factor(),j.getItem().exp()*i.getItem().exp())); 432 432 } 433 433 return Output; … … 450 450 /* 451 451 $Log: not supported by cvs2svn $ 452 Revision 1.8 2006/06/19 13:37:46 Singular 453 *hannes: more CS renamed 454 452 455 Revision 1.7 2006/05/16 14:46:48 Singular 453 456 *hannes: gcc 4.1 fixes
Note: See TracChangeset
for help on using the changeset viewer.