Changeset 806c18 in git for factory/facFqFactorizeUtil.cc

Timestamp:

Nov 15, 2010, 4:34:57 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

7c3bca08c96331a56864c1d35b8c2e8ff2e0be89

Parents:

c840d97af622b4e4da8761738b540e21144f716b

Message:

format

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

File:

• factory/facFqFactorizeUtil.cc (modified) (7 diffs)

factory/facFqFactorizeUtil.cc

@@ -1 +1 @@
 /*****************************************************************************\
- * Computer Algebra System SINGULAR    
+ * Computer Algebra System SINGULAR
 \*****************************************************************************/
 /** @file facFqFactorizeUtil.cc
- * 
+ *
  * This file provides utility functions for multivariate factorization
  *
@@ -18 +18 @@
 #include "cf_map.h"
 
-static inline 
+static inline
 void appendSwap (CFList& factors1, const CFList& factors2, const int
-                  swapLevel1, const int swapLevel2, const Variable& x) 
+                  swapLevel1, const int swapLevel2, const Variable& x)
 {
-  for (CFListIterator i= factors2; i.hasItem(); i++) 
-  { 
-    if (swapLevel1) 
+  for (CFListIterator i= factors2; i.hasItem(); i++)
+  {
+    if (swapLevel1)
     {
       if (swapLevel2)
-        factors1.append (swapvar (swapvar (i.getItem(), x, 
+        factors1.append (swapvar (swapvar (i.getItem(), x,
                          Variable (swapLevel2)), Variable (swapLevel1), x));
       else
-        factors1.append (swapvar (i.getItem(), Variable (swapLevel1), x));
+        factors1.append (swapvar (i.getItem(), Variable (swapLevel1), x));
     }
-    else 
+    else
     {
       if (swapLevel2)
-        factors1.append (swapvar (i.getItem(), x, Variable (swapLevel2)));
-      else 
-        factors1.append (i.getItem());
+        factors1.append (swapvar (i.getItem(), x, Variable (swapLevel2)));
+      else
+        factors1.append (i.getItem());
     }
   }
@@ -45 +45 @@
 
 void swap (CFList& factors, const int swapLevel1, const int swapLevel2, const
-           Variable& x) 
+           Variable& x)
 {
-  for (CFListIterator i= factors; i.hasItem(); i++) 
-  { 
-    if (swapLevel1) 
+  for (CFListIterator i= factors; i.hasItem(); i++)
+  {
+    if (swapLevel1)
     {
       if (swapLevel2)
-        i.getItem()= swapvar (swapvar (i.getItem(), x, Variable (swapLevel2)),
+        i.getItem()= swapvar (swapvar (i.getItem(), x, Variable (swapLevel2)),
                               Variable (swapLevel1), x);
       else
-        i.getItem()= swapvar (i.getItem(), Variable (swapLevel1), x);
+        i.getItem()= swapvar (i.getItem(), Variable (swapLevel1), x);
     }
-    else 
+    else
     {
       if (swapLevel2)
-        i.getItem()= swapvar (i.getItem(), x, Variable (swapLevel2));
+        i.getItem()= swapvar (i.getItem(), x, Variable (swapLevel2));
     }
   }
@@ -66 +66 @@
 }
 
-void appendSwapDecompress (CFList& factors1, const CFList& factors2, 
+void appendSwapDecompress (CFList& factors1, const CFList& factors2,
                              const CFMap& N, const int swapLevel, const
-                             Variable& x) 
+                             Variable& x)
 {
-  for (CFListIterator i= factors1; i.hasItem(); i++) 
+  for (CFListIterator i= factors1; i.hasItem(); i++)
   {
-    if (swapLevel)   
+    if (swapLevel)
       i.getItem()= swapvar (i.getItem(), Variable (swapLevel), x);
     i.getItem()= N(i.getItem());
   }
-  for (CFListIterator i= factors2; i.hasItem(); i++) 
+  for (CFListIterator i= factors2; i.hasItem(); i++)
   {
-    if (!i.getItem().inCoeffDomain()) 
+    if (!i.getItem().inCoeffDomain())
       factors1.append (N (i.getItem()));
   }
@@ -84 +84 @@
 }
 
-void appendSwapDecompress (CFList& factors1, const CFList& factors2, 
-                             const CFMap& N, const int swapLevel1, 
-                             const int swapLevel2, const Variable& x) 
+void appendSwapDecompress (CFList& factors1, const CFList& factors2,
+                             const CFMap& N, const int swapLevel1,
+                             const int swapLevel2, const Variable& x)
 {
-  for (CFListIterator i= factors1; i.hasItem(); i++) 
+  for (CFListIterator i= factors1; i.hasItem(); i++)
   {
-    if (swapLevel1) 
+    if (swapLevel1)
     {
-      if (swapLevel2) 
+      if (swapLevel2)
         i.getItem()=
         N (swapvar (swapvar (i.getItem(), Variable (swapLevel2), x), x,
                     Variable (swapLevel1)));
-      else 
+      else
         i.getItem()= N (swapvar (i.getItem(), x, Variable (swapLevel1)));
     }
-    else 
+    else
     {
       if (swapLevel2)
@@ -107 +107 @@
     }
   }
-  for (CFListIterator i= factors2; i.hasItem(); i++) 
-  { 
-    if (!i.getItem().inCoeffDomain())  
+  for (CFListIterator i= factors2; i.hasItem(); i++)
+  {
+    if (!i.getItem().inCoeffDomain())
       factors1.append (N (i.getItem()));
   }
@@ -115 +115 @@
 }
 
-int* liftingBounds (const CanonicalForm& A, const int& bivarLiftBound) 
+int* liftingBounds (const CanonicalForm& A, const int& bivarLiftBound)
 {
   int j= A.level() - 1;
   int* liftBounds= new int [j];
   liftBounds[0]= bivarLiftBound;
-  for (int i= 1; i < j; i++) 
+  for (int i= 1; i < j; i++)
   {
-    liftBounds[i]= degree (A, Variable (i + 2)) + 1 + 
+    liftBounds[i]= degree (A, Variable (i + 2)) + 1 +
                             degree (LC (A, 1), Variable (i + 2));
   }