Changeset dad0bc5 in git for factory/NTLconvert.cc

Timestamp:

Dec 9, 2005, 9:35:38 AM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

172b7ae49955a6c96c685cbe68ee3f257d89bd46

Parents:

1b82a2e051a986276fd759237c823aecfb97b2be

Message:

*hannes: factorization of homog.polys, SORT for factorize


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

File:

• factory/NTLconvert.cc (modified) (9 diffs)

factory/NTLconvert.cc

@@ -1 @@
-/* $Id: NTLconvert.cc,v 1.13 2004-01-19 11:26:19 Singular Exp $ */
+/* $Id: NTLconvert.cc,v 1.14 2005-12-09 08:35:37 Singular Exp $ */
 #include <config.h>
 
@@ -419 +419 @@
 }
 
-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                              //
@@ -468 +460 @@
     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))
@@ -495 +486 @@
     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))
@@ -556 +546 @@
     rueckgabe.append(CFFactor(bigone,exponent));
   }
-  if(isOn(SW_USE_NTL_SORT)) rueckgabe.sort(NTLcmpCF);
   return rueckgabe;
 }
@@ -777 +766 @@
     rueckgabe.append(CFFactor(bigone,exponent));
   }
-  if(isOn(SW_USE_NTL_SORT)) rueckgabe.sort(NTLcmpCF);
   // the multiplicity at pos 1
   //if (!IsOne(multi))
@@ -869 +857 @@
     rueckgabe.append(CFFactor(bigone,exponent));
   }
-  if(isOn(SW_USE_NTL_SORT)) rueckgabe.sort(NTLcmpCF);
   // Start by appending the multiplicity
   if (!IsOne(multi))
@@ -914 +901 @@
     rueckgabe.append(CFFactor(bigone,exponent));
   }
-  if(isOn(SW_USE_NTL_SORT)) rueckgabe.sort(NTLcmpCF);
   // Start by appending the multiplicity
   if (!IsOne(multi))
@@ -1007 +993 @@
 
   }
-  if(isOn(SW_USE_NTL_SORT)) rueckgabe.sort(NTLcmpCF);
   // return the computed CFFList
   return rueckgabe;