Changeset d1dc39 in git

Timestamp:

Apr 28, 2012, 10:11:51 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

7a1151d0e820ebe7486137ac2e2edc736ee573fd

Parents:

18a66064a9a8616bef22907b60e68633bfc80c55

git-author:

Martin Lee <martinlee84@web.de>2012-04-28 22:11:51+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-05-07 18:19:12+02:00

Message:

fix: deleted unused variables

Location:

factory

Files:

• cf_gcd_smallp.cc (modified) (11 diffs)
• facFqBivar.cc (modified) (21 diffs)
• facFqBivarUtil.cc (modified) (2 diffs)

factory/cf_gcd_smallp.cc

@@ -1596 +1596 @@
   bool fail= false;
   bool inextension= false;
-  bool inextensionextension= false;
-  bool topLevel2= false;
+  topLevel= false;
   CFList source, dest;
   int bound1= degree (ppA, 1);
@@ -1614 +1613 @@
       G_random_element=
       GCD_small_p (ppA (random_element,x), ppB (random_element,x),
-                   coF_random_element, coG_random_element, topLevel2,
+                   coF_random_element, coG_random_element, topLevel,
                    list);
       TIMING_END_AND_PRINT (gcd_recursion,
@@ -1627 +1626 @@
       GCD_Fp_extension (ppA (random_element, x), ppB (random_element, x),
                         coF_random_element, coG_random_element, alpha,
-                        list, topLevel2);
+                        list, topLevel);
       TIMING_END_AND_PRINT (gcd_recursion,
                             "time for recursive call: ");
@@ -1653 +1652 @@
       GCD_Fp_extension (ppA (random_element, x), ppB (random_element, x),
                         coF_random_element, coG_random_element, alpha,
-                        list, topLevel2);
+                        list, topLevel);
       TIMING_END_AND_PRINT (gcd_recursion,
                             "time for recursive call: ");
@@ -1698 +1697 @@
       DEBOUTLN (cerr, "getMipo (alpha)= " << getMipo (V_buf2));
 
-      inextensionextension= true;
       for (CFListIterator i= l; i.hasItem(); i++)
         i.getItem()= mapUp (i.getItem(), alpha, V_buf, prim_elem,
@@ -1722 +1720 @@
       GCD_Fp_extension (ppA (random_element, x), ppB (random_element, x),
                         coF_random_element, coG_random_element, V_buf,
-                        list, topLevel2);
+                        list, topLevel);
       TIMING_END_AND_PRINT (gcd_recursion,
                             "time for recursive call: ");
@@ -3023 +3021 @@
     }
 
-    long rk;
     matColumns= biggestSize2 - 1;
     matRows= 0;
@@ -3029 +3026 @@
     {
       if (V_buf.level() == 1)
-        rk= gaussianElimFp (pMat[i], pL[i]);
+        (void) gaussianElimFp (pMat[i], pL[i]);
       else
-        rk= gaussianElimFq (pMat[i], pL[i], V_buf);
+        (void) gaussianElimFq (pMat[i], pL[i], V_buf);
 
       if (pMat[i] (coeffMonoms[i].size(), coeffMonoms[i].size()) == 0)
@@ -3706 +3703 @@
   topLevel= false;
   bool inextension= false;
-  bool inextensionextension= false;
   Variable V_buf, alpha;
   CanonicalForm prim_elem, im_prim_elem;
@@ -3807 +3803 @@
       DEBOUTLN (cerr, "getMipo (alpha)= " << getMipo (V_buf2));
 
-      inextensionextension= true;
       for (CFListIterator i= l; i.hasItem(); i++)
         i.getItem()= mapUp (i.getItem(), alpha, V_buf, prim_elem,
@@ -4009 +4004 @@
           DEBOUTLN (cerr, "getMipo (alpha)= " << getMipo (V_buf2));
 
-          inextensionextension= true;
           for (CFListIterator i= l; i.hasItem(); i++)
             i.getItem()= mapUp (i.getItem(), alpha, V_buf, prim_elem,

factory/facFqBivar.cc

@@ -2284 +2284 @@
                   )
 {
-  bool irreducible= false;
   int d;
   int* bounds= computeBounds (F, d);
@@ -2347 +2346 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           delete [] A;
           delete [] bounds;
@@ -2417 +2415 @@
                   )
 {
-  bool irreducible= false;
   int d;
   int* bounds= computeBounds (F, d);
@@ -2480 +2477 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           delete [] A;
           delete [] bounds;
@@ -2552 +2548 @@
   int degMipo= degree (getMipo (info.getAlpha()));
   Variable alpha= info.getAlpha();
-  bool irreducible= false;
   int d;
   int* bounds= computeBounds (F, d);
@@ -2669 +2664 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           Variable y= Variable (2);
           CanonicalForm tmp= F (y - evaluation, y);
@@ -2741 +2735 @@
                     const Variable& alpha, int precision)
 {
-  bool irreducible= false;
   int d;
   int* bounds= computeBounds (F, d);
@@ -2805 +2798 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           delete [] A;
           delete [] bounds;
@@ -2863 +2855 @@
                        )
 {
-  bool irreducible= false;
   int d;
   int* bounds= computeBounds (F, d);
@@ -2927 +2918 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           delete [] A;
           delete [] bounds;
@@ -2995 +2985 @@
 {
   CFList result= CFList();
-  bool irreducible= false;
   CFArray * A= new CFArray [factors.length()];
   int oldL2= oldL/2;
@@ -3052 +3041 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           delete [] A;
           return CFList (F);
@@ -3060 +3048 @@
     if (NTLN.NumCols() == 1)
     {
-      irreducible= true;
       delete [] A;
       return CFList (F);
@@ -3102 +3089 @@
 {
   CFList result= CFList();
-  bool irreducible= false;
   CFArray * A= new CFArray [factors.length()];
   int oldL2= oldL/2;
@@ -3156 +3142 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           delete [] A;
           return CFList (F);
@@ -3164 +3149 @@
     if (NTLN.NumCols() == 1)
     {
-      irreducible= true;
       delete [] A;
       return CFList (F);
@@ -3210 +3194 @@
 {
   CFList result= CFList();
-  bool irreducible= false;
   CFArray * A= new CFArray [factors.length()];
   int oldL2= oldL/2; //be careful
@@ -3321 +3304 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           Variable y= Variable (2);
           CanonicalForm tmp= F (y - evaluation, y);
@@ -3333 +3315 @@
     if (NTLN.NumCols() == 1)
     {
-      irreducible= true;
       Variable y= Variable (2);
       CanonicalForm tmp= F (y - evaluation, y);
@@ -3382 +3363 @@
 {
   CFList result= CFList();
-  bool irreducible= false;
   CFArray * A= new CFArray [factors.length()];
   int extensionDeg= degree (getMipo (alpha));
@@ -3437 +3417 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           delete [] A;
           return CFList (F);

factory/facFqBivarUtil.cc

@@ -669 +669 @@
   int** newtonPolyg= newtonPolygon (F, sizeOfNewtonPolygon);
 
-  int minXIndex= 0, minYIndex= 0, maxXIndex= 0, maxYIndex= 0;
   int minX, minY, maxX, maxY;
   minX= newtonPolyg [0] [0];
@@ -678 +677 @@
   {
     if (minX > newtonPolyg [i] [0])
-    {
       minX= newtonPolyg [i] [0];
-      minXIndex= i;
-    }
     if (maxX < newtonPolyg [i] [0])
-    {
       maxX= newtonPolyg [i] [0];
-      maxXIndex= i;
-    }
     if (minY > newtonPolyg [i] [1])
-    {
       minY= newtonPolyg [i] [1];
-      minYIndex= i;
-    }
     if (maxY < newtonPolyg [i] [1])
-    {
       maxY= newtonPolyg [i] [1];
-      maxYIndex= i;
-    }
   }