Changeset 7993ad in git

Timestamp:

Nov 15, 2010, 11:55:28 AM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

d77a70e48aa5be934ca92380ce7754a935ae2aec

Parents:

8eb6da1cea8ad61c747aa7cebf16cdde3c452b1b

Message:

mydivrem removed

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

Location:

libfac/factor

Files:

• helpstuff.cc (modified) (11 diffs)
• helpstuff.h (modified) (1 diff)

libfac/factor/helpstuff.cc

@@ -11 +11 @@
 
 bool
-mydivremt ( const CanonicalForm& f, const CanonicalForm& g, CanonicalForm& a, CanonicalForm& b ){
+mydivremt ( const CanonicalForm& f, const CanonicalForm& g, CanonicalForm& a, CanonicalForm& b )
+{
   bool retvalue;
   CanonicalForm aa,bb;
@@ -19 +20 @@
   else { b=aa; }
   return retvalue;
-}
-
-void
-mydivrem( const CanonicalForm& f, const CanonicalForm& g, CanonicalForm& a, CanonicalForm& b ){
-  bool retvalue;
-  CanonicalForm aa,bb;
-  retvalue = divremt(f,g,a,bb);
-  aa= f-g*a;
-  if ( aa==bb ) { b=bb; }
-  else { b=aa; }
 }
 
@@ -40 +31 @@
 ///////////////////////////////////////////////////////////////
 CFFList
-myappend( const CFFList & Inputlist, const CFFactor & TheFactor){
+myappend( const CFFList & Inputlist, const CFFactor & TheFactor)
+{
   CFFList Outputlist ;
   CFFactor copy;
@@ -46 +38 @@
   int exp=0;
 
-  for ( i=Inputlist ; i.hasItem() ; i++ ){
+  for ( i=Inputlist ; i.hasItem() ; i++ )
+  {
     copy = i.getItem();
     if ( copy.factor() == TheFactor.factor() )
@@ -58 +51 @@
 
 CFFList
-myUnion(const CFFList & Inputlist1,const CFFList & Inputlist2){
+myUnion(const CFFList & Inputlist1,const CFFList & Inputlist2)
+{
   CFFList Outputlist;
   CFFListIterator i;
@@ -71 +65 @@
 
 int
-Powerup( const int base , const int exp){
+Powerup( const int base , const int exp)
+{
   int retvalue=1;
   if ( exp == 0 )  return retvalue ;
@@ -91 +86 @@
 static void
 modpower( const CanonicalForm & f, int k , int td,
-          const CanonicalForm & t, CanonicalForm & result){
+          const CanonicalForm & t, CanonicalForm & result)
+{
 
   if ( td >= k ) return;
@@ -103 +99 @@
 
 CanonicalForm
-mod_power( const CanonicalForm & f, int k, int levelU){
+mod_power( const CanonicalForm & f, int k, int levelU)
+{
   CanonicalForm result,dummy;
   Variable x(levelU);
@@ -109 +106 @@
   if ( levelU > level(f) )
     modpower(f,k,0,1,result);
-  else{
-    for ( CFIterator i=f; i.hasTerms(); i++){
+  else
+  {
+    for ( CFIterator i=f; i.hasTerms(); i++)
+    {
       dummy = 0;
       modpower(i.coeff(),k,0,1,dummy);
@@ -128 +127 @@
 ///////////////////////////////////////////////////////////////
 int
-subvardegree( const CanonicalForm & F, int levelF ){
+subvardegree( const CanonicalForm & F, int levelF )
+{
   int n=0,m=degree(F,levelF),newn=0;
 
-  for ( int k=0; k<=m; k++ ){
+  for ( int k=0; k<=m; k++ )
+  {
     newn = totaldegree( F[k] );
     if ( newn > n ) n=newn;
@@ -142 +143 @@
 ///////////////////////////////////////////////////////////////
 CanonicalForm
-change_poly( const CanonicalForm & f , const SFormList & Substitutionlist ,int directionback ){
+change_poly( const CanonicalForm & f , const SFormList & Substitutionlist ,int directionback )
+{
   CanonicalForm F=f,g,k;
   int level_i;
 //  Variable x;
 
-  for ( SFormListIterator i=Substitutionlist; i.hasItem(); i++){
+  for ( SFormListIterator i=Substitutionlist; i.hasItem(); i++)
+  {
   // now we can access: i.getItem().factor()  -> level(~) gives x_i
   //                    i.getItem().exp()     -> gives a_i

libfac/factor/helpstuff.h

@@ -6 +6 @@
 #define HELPSTUFF_H
 bool mydivremt ( const CanonicalForm&, const CanonicalForm&, CanonicalForm&, CanonicalForm& );
-void mydivrem( const CanonicalForm& f, const CanonicalForm& g, CanonicalForm& a, CanonicalForm& b );
 ///////////////////////////////////////////////////////////////
 // Now some procedures used in MVMultiHensel and in Truefactors