Changeset a4b949 in git

Timestamp:

Oct 13, 2011, 9:22:08 PM (12 years ago)

Author:

Niels Ranosch <ranosch@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

82db91acfc327c4583f75ec07981145804778f97

Parents:

14212fa342ce39308f53a23f26a3db6a7646a3fe

git-author:

Niels Ranosch <ranosch@mfo.de>2011-10-13 21:22:08+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:14:04+01:00

Message:

FIX: variables should have English names, e.g. rueckgabe -> result

File:

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

factory/NTLconvert.cc

@@ -415 +415 @@
 {
   //printf("convertNTLvec_pair_ZZpX_long2FacCFFList\n");
-  CFFList rueckgabe;
+  CFFList result;
   ZZ_pX polynom;
   CanonicalForm bigone;
@@ -429 +429 @@
   for (int i=e.length()-1;i>=0;i--)
   {
-    rueckgabe.append(CFFactor(convertNTLZZpX2CF(e[i].a,x),e[i].b));
+    result.append(CFFactor(convertNTLZZpX2CF(e[i].a,x),e[i].b));
   }
   // the multiplicity at pos 1
   if (!IsOne(multi))
-    rueckgabe.insert(CFFactor(CanonicalForm(to_long(rep(multi))),1));
-  return rueckgabe;
+    result.insert(CFFactor(CanonicalForm(to_long(rep(multi))),1));
+  return result;
 }
 CFFList convertNTLvec_pair_zzpX_long2FacCFFList
@@ -440 +440 @@
 {
   //printf("convertNTLvec_pair_zzpX_long2FacCFFList\n");
-  CFFList rueckgabe;
+  CFFList result;
   zz_pX polynom;
   CanonicalForm bigone;
@@ -454 +454 @@
   for (int i=e.length()-1;i>=0;i--)
   {
-    rueckgabe.append(CFFactor(convertNTLzzpX2CF(e[i].a,x),e[i].b));
+    result.append(CFFactor(convertNTLzzpX2CF(e[i].a,x),e[i].b));
   }
   // the multiplicity at pos 1
   if (!IsOne(multi))
-    rueckgabe.insert(CFFactor(CanonicalForm(to_long(rep(multi))),1));
-  return rueckgabe;
+    result.insert(CFFactor(CanonicalForm(to_long(rep(multi))),1));
+  return result;
 }
 
@@ -487 +487 @@
 {
   //printf("convertNTLvec_pair_GF2X_long2FacCFFList\n");
-  CFFList rueckgabe;
+  CFFList result;
   GF2X polynom;
   long exponent;
@@ -514 +514 @@
 
     //append the converted polynomial to the CFFList
-    rueckgabe.append(CFFactor(bigone,exponent));
-  }
-  return rueckgabe;
+    result.append(CFFactor(bigone,exponent));
+  }
+  return result;
 }
 
@@ -727 +727 @@
 CFFList convertNTLvec_pair_ZZX_long2FacCFFList(vec_pair_ZZX_long e,ZZ multi,Variable x)
 {
-  CFFList rueckgabe;
+  CFFList result;
   ZZX polynom;
   long exponent;
@@ -741 +741 @@
     bigone=convertNTLZZX2CF(polynom,x);
     //append the converted polynomial to the list
-    rueckgabe.append(CFFactor(bigone,exponent));
+    result.append(CFFactor(bigone,exponent));
   }
   // the multiplicity at pos 1
   //if (!IsOne(multi))
-    rueckgabe.insert(CFFactor(convertZZ2CF(multi),1));
+    result.insert(CFFactor(convertZZ2CF(multi),1));
 
   //return the converted list
-  return rueckgabe;
+  return result;
 }
 
@@ -799 +799 @@
 CFFList convertNTLvec_pair_ZZpEX_long2FacCFFList(vec_pair_ZZ_pEX_long e,ZZ_pE multi,Variable x,Variable alpha)
 {
-  CFFList rueckgabe;
+  CFFList result;
   ZZ_pEX polynom;
   long exponent;
@@ -832 +832 @@
     }
     //append the computed polynomials together with its exponent to the CFFList
-    rueckgabe.append(CFFactor(bigone,exponent));
+    result.append(CFFactor(bigone,exponent));
   }
   // Start by appending the multiplicity
   if (!IsOne(multi))
-    rueckgabe.insert(CFFactor(convertNTLZZpE2CF(multi,alpha),1));
+    result.insert(CFFactor(convertNTLZZpE2CF(multi,alpha),1));
 
   //return the computed CFFList
-  return rueckgabe;
+  return result;
 }
 CFFList convertNTLvec_pair_zzpEX_long2FacCFFList(vec_pair_zz_pEX_long e,zz_pE multi,Variable x,Variable alpha)
 {
-  CFFList rueckgabe;
+  CFFList result;
   zz_pEX polynom;
   long exponent;
@@ -876 +876 @@
     }
     //append the computed polynomials together with its exponent to the CFFList
-    rueckgabe.append(CFFactor(bigone,exponent));
+    result.append(CFFactor(bigone,exponent));
   }
   // Start by appending the multiplicity
   if (!IsOne(multi))
-    rueckgabe.insert(CFFactor(convertNTLzzpE2CF(multi,alpha),1));
+    result.insert(CFFactor(convertNTLzzpE2CF(multi,alpha),1));
 
   //return the computed CFFList
-  return rueckgabe;
+  return result;
 }
 
@@ -931 +931 @@
 CFFList convertNTLvec_pair_GF2EX_long2FacCFFList(vec_pair_GF2EX_long e,GF2E multi,Variable x,Variable alpha)
 {
-  CFFList rueckgabe;
+  CFFList result;
   GF2EX polynom;
   long exponent;
@@ -967 +967 @@
 
     // append the computed polynomial together with its multiplicity
-    rueckgabe.append(CFFactor(bigone,exponent));
+    result.append(CFFactor(bigone,exponent));
 
   }
   // return the computed CFFList
-  return rueckgabe;
+  return result;
 }