Changeset 9d3636 in git

Timestamp:

Feb 11, 2003, 5:28:51 PM (21 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

0191db90f1b4ad6d544bae570504054ff0db0eaf

Parents:

2d5452f3d3805a37d772af1fae5d485b759089df

Message:

*hannes: SW_NTL_SORT


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

Location:

factory

Files:

• NTLconvert.cc (modified) (11 diffs)
• cf_defs.h (modified) (2 diffs)
• templates/ftmpl_list.cc (modified) (3 diffs)

factory/NTLconvert.cc

@@ -1 @@
-/* $Id: NTLconvert.cc,v 1.5 2003-02-04 16:24:59 Singular Exp $ */
+/* $Id: NTLconvert.cc,v 1.6 2003-02-11 16:28:48 Singular Exp $ */
 #include <config.h>
 
@@ -292 +292 @@
 }
 
+static int
+NTLcmpCF( const CFFactor & f, const CFFactor & g )
+{
+  if (f.exp() > g.exp()) return 1;
+  if (f.exp() < g.exp()) return 0;
+  if (f.factor() > g.factor()) return 1;
+  return 0;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NAME: convertNTLvec_pair_ZZpX_long2FacCFFList                              //
@@ -326 +335 @@
   // so it is omitted
 
-  // Start by appending the multiplicity
-  if (!IsOne(multi))
-    rueckgabe.append(CFFactor(CanonicalForm(to_long(rep(multi))),1));
 
   // Go through the vector e and compute the CFFList
@@ -336 +342 @@
     rueckgabe.append(CFFactor(convertNTLZZpX2CF(e[i].a,x),e[i].b));
   }
-
+  if(isOn(SW_USE_NTL_SORT)) rueckgabe.sort(NTLcmpCF);
+  // the multiplicity at pos 1
+  if (!IsOne(multi))
+    rueckgabe.insert(CFFactor(CanonicalForm(to_long(rep(multi))),1));
   return rueckgabe;
 }
@@ -394 +403 @@
     rueckgabe.append(CFFactor(bigone,exponent));
   }
-
+  if(isOn(SW_USE_NTL_SORT)) rueckgabe.sort(NTLcmpCF);
   return rueckgabe;
 }
@@ -607 +616 @@
 
 
-  // Start by appending the multiplicity
-
-  //if (!IsOne(multi))
-    rueckgabe.append(CFFactor(convertZZ2CF(multi),1));
-
   // Go through the vector e and build up the CFFList
   // As usual bigone summarizes the result
@@ -634 +638 @@
     rueckgabe.append(CFFactor(bigone,exponent));
   }
+  if(isOn(SW_USE_NTL_SORT)) rueckgabe.sort(NTLcmpCF);
+  // the multiplicity at pos 1
+  //if (!IsOne(multi))
+    rueckgabe.insert(CFFactor(convertZZ2CF(multi),1));
+
   //return the converted list
   return rueckgabe;
@@ -690 +699 @@
   //important for the factorization, but nevertheless would take computing time, so it is omitted
 
-
-  // Start by appending the multiplicity
-  if (!IsOne(multi))
-    rueckgabe.append(CFFactor(convertNTLZZpE2CF(multi,alpha),1));
-
-
   // Go through the vector e and build up the CFFList
   // As usual bigone summarizes the result during every loop
@@ -720 +723 @@
       }
     }
-
     //append the computed polynomials together with its exponent to the CFFList
     rueckgabe.append(CFFactor(bigone,exponent));
-
-  }
+  }
+  if(isOn(SW_USE_NTL_SORT)) rueckgabe.sort(NTLcmpCF);
+  // Start by appending the multiplicity
+  if (!IsOne(multi))
+    rueckgabe.insert(CFFactor(convertNTLZZpE2CF(multi,alpha),1));
+
   //return the computed CFFList
   return rueckgabe;
@@ -788 +794 @@
   for (int i=e.length()-1;i>=0;i--)
   {
-     bigone=0;
-
-     polynom=e[i].a;
-     exponent=e[i].b;
-
-     for (int j=0;j<deg(polynom)+1;j++)
-     {
-       if (IsOne(coeff(polynom,j)))
-       {
-         bigone+=power(x,j);
-       }
-       else
-       {
-         CanonicalForm coefficient=convertNTLGF2E2CF(coeff(polynom,j),alpha);
-         if (coeff(polynom,j)!=0)
-         {
-           bigone += (power(x,j)*coefficient);
-         }
-       }
-     }
-
-     // append the computed polynomial together with its multiplicity
-     rueckgabe.append(CFFactor(bigone,exponent));
-
-   }
-   // return the computed CFFList
+    bigone=0;
+
+    polynom=e[i].a;
+    exponent=e[i].b;
+
+    for (int j=0;j<deg(polynom)+1;j++)
+    {
+      if (IsOne(coeff(polynom,j)))
+      {
+        bigone+=power(x,j);
+      }
+      else
+      {
+        CanonicalForm coefficient=convertNTLGF2E2CF(coeff(polynom,j),alpha);
+        if (coeff(polynom,j)!=0)
+        {
+          bigone += (power(x,j)*coefficient);
+        }
+      }
+    }
+
+    // append the computed polynomial together with its multiplicity
+    rueckgabe.append(CFFactor(bigone,exponent));
+
+  }
+  if(isOn(SW_USE_NTL_SORT)) rueckgabe.sort(NTLcmpCF);
+  // return the computed CFFList
   return rueckgabe;
 }
@@ -852 +859 @@
   return result;
 }
-
-
 #endif

factory/cf_defs.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_defs.h,v 1.8 2002-07-30 15:23:15 Singular Exp $ */
+/* $Id: cf_defs.h,v 1.9 2003-02-11 16:28:50 Singular Exp $ */
 
 #ifndef INCL_CF_DEFS_H
@@ -37 +37 @@
 const int SW_USE_NTL=8;
 const int SW_USE_NTL_GCD=9;
+const int SW_USE_NTL_SORT=10;
 //}}}
 

factory/templates/ftmpl_list.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: ftmpl_list.cc,v 1.7 1998-03-10 14:51:32 schmidt Exp $ */
+/* $Id: ftmpl_list.cc,v 1.8 2003-02-11 16:28:51 Singular Exp $ */
 
 #include <factoryconf.h>
@@ -311 +311 @@
 {
     if ( first != last ) {
-        int swap = 1;
-        while ( swap ) {
+        int swap;
+        do {
             swap = 0;
             ListItem<T> *cur = first;
@@ -324 +324 @@
                 cur = cur->next;
             }
-        }
+        } while (swap);
     }
 }