Changeset 6af78bb in git for factory/facFactorize.cc

Timestamp:

Aug 10, 2012, 11:49:12 AM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '1d362c315e551a5b527ab0759f8839cf0e94f3a5')

Children:

8797746f0462992c4a00f27f0837b923a3f847de

Parents:

1a2d6611738ea83b676a2b906a53986d841f8957

git-author:

Martin Lee <martinlee84@web.de>2012-08-10 11:49:12+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-09-04 18:01:17+02:00

Message:

chg: minor optimization

File:

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

factory/facFactorize.cc

@@ -920 +920 @@
   A /= hh;
 
+  CFListIterator iter2;
   CFList bufFactors= CFList();
   if (LucksWangSparseHeuristic (A, biFactors, 2, leadingCoeffs2 [A.level() - 3],
@@ -975 +976 @@
       CanonicalForm cont;
       CFList contents, LCs;
-      CFListIterator iter2;
       int index=1;
       bool foundTrueMultiplier= false;
@@ -1200 +1200 @@
 
   CFList commonDenominators;
-  for (CFListIterator iter=biFactors; iter.hasItem(); iter++)
+  for (iter=biFactors; iter.hasItem(); iter++)
     commonDenominators.append (bCommonDen (iter.getItem()));
   CanonicalForm tmp1, tmp2, tmp3=1;
-  CFListIterator iter1, iter2;
   for (int i= 0; i < A.level() - 2; i++)
   {
     iter2= commonDenominators;
-    for (iter1= leadingCoeffs2[i]; iter1.hasItem(); iter1++, iter2++)
-    {
-      tmp1= bCommonDen (iter1.getItem());
+    for (iter= leadingCoeffs2[i]; iter.hasItem(); iter++, iter2++)
+    {
+      tmp1= bCommonDen (iter.getItem());
       Off (SW_RATIONAL);
       iter2.getItem()= lcm (iter2.getItem(), tmp1);
@@ -1216 +1215 @@
   }
   tmp1= prod (commonDenominators);
-  for (iter1= Aeval; iter1.hasItem(); iter1++)
-  {
-    tmp2= bCommonDen (iter1.getItem());
+  for (iter= Aeval; iter.hasItem(); iter++)
+  {
+    tmp2= bCommonDen (iter.getItem());
     Off (SW_RATIONAL);
     tmp3= lcm (tmp2,tmp3);
@@ -1226 +1225 @@
   multiplier= tmp3/tmp1;
   iter2= commonDenominators;
-  for (iter1=biFactors; iter1.hasItem(); iter1++, iter2++)
-    iter1.getItem() *= iter2.getItem()*multiplier;
-
-  for (iter1= Aeval; iter1.hasItem(); iter1++)
-    iter1.getItem() *= tmp3*power (multiplier, biFactors.length() - 1);
+  for (iter=biFactors; iter.hasItem(); iter++, iter2++)
+    iter.getItem() *= iter2.getItem()*multiplier;
+
+  for (iter= Aeval; iter.hasItem(); iter++)
+    iter.getItem() *= tmp3*power (multiplier, biFactors.length() - 1);
 
   for (int i= 0; i < A.level() - 2; i++)
   {
     iter2= commonDenominators;
-    for (iter1= leadingCoeffs2[i]; iter1.hasItem(); iter1++, iter2++)
-      iter1.getItem() *= iter2.getItem()*multiplier;
+    for (iter= leadingCoeffs2[i]; iter.hasItem(); iter++, iter2++)
+      iter.getItem() *= iter2.getItem()*multiplier;
   }