Changeset e2e4be in git

Timestamp:

Nov 15, 2012, 2:18:16 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a0adc352c26b5251da621e2cb0af660bff3364a5

Parents:

a64b0ebe60fbdf0eb713f74e6e4932492b5058b3

git-author:

Martin Lee <martinlee84@web.de>2012-11-15 14:18:16+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-11-16 13:13:24+01:00

Message:

chg: replaced balance by balance_p

File:

• factory/cf_gcd.cc (modified) (5 diffs)

factory/cf_gcd.cc

@@ -463 +463 @@
 //}}}
 
-//{{{ static CanonicalForm balance ( const CanonicalForm & f, const CanonicalForm & q )
+//{{{ static CanonicalForm balance_p ( const CanonicalForm & f, const CanonicalForm & q )
 //{{{ docu
 //
-// balance() - map f from positive to symmetric representation
+// balance_p() - map f from positive to symmetric representation
 //   mod q.
 //
@@ -476 +476 @@
 //}}}
 static CanonicalForm
+balance_p ( const CanonicalForm & f, const CanonicalForm & q )
+{
+    Variable x = f.mvar();
+    CanonicalForm result = 0, qh = q / 2;
+    CanonicalForm c;
+    CFIterator i;
+    for ( i = f; i.hasTerms(); i++ )
+    {
+        c = i.coeff();
+        if ( c.inCoeffDomain())
+        {
+          if ( c > qh )
+            result += power( x, i.exp() ) * (c - q);
+          else
+            result += power( x, i.exp() ) * c;
+        }
+        else
+          result += power( x, i.exp() ) * balance_p(c,q);
+    }
+    return result;
+}
+
+/*static CanonicalForm
 balance ( const CanonicalForm & f, const CanonicalForm & q )
 {
@@ -490 +513 @@
     }
     return result;
-}
+}*/
 //}}}
 
@@ -566 +589 @@
     {
       // now balance D mod q
-      D = pp( balance( D, q ) );
+      D = pp( balance_p( D, q ) );
       if ( fdivides( D, f ) && fdivides( D, g ) )
         return D * c;
@@ -1204 +1227 @@
     delete [] degsg;
 }*/
-
-
-static CanonicalForm
-balance_p ( const CanonicalForm & f, const CanonicalForm & q )
-{
-    Variable x = f.mvar();
-    CanonicalForm result = 0, qh = q / 2;
-    CanonicalForm c;
-    CFIterator i;
-    for ( i = f; i.hasTerms(); i++ )
-    {
-        c = i.coeff();
-        if ( c.inCoeffDomain())
-        {
-          if ( c > qh )
-            result += power( x, i.exp() ) * (c - q);
-          else
-            result += power( x, i.exp() ) * c;
-        }
-        else
-          result += power( x, i.exp() ) * balance_p(c,q);
-    }
-    return result;
-}
 
 TIMING_DEFINE_PRINT(chinrem_termination)