Changeset c1b9927 in git for factory/facFqBivar.cc

Timestamp:

Jun 7, 2011, 3:27:18 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

639652f186091509059ccc76f18852db93c1b988

Parents:

6e2ef0e6c1f75468f4ae12cfb9e5273eb4aa81c1

Message:

- removed some unsed variables
- never put static inline routine without a body in a .h file



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

File:

• factory/facFqBivar.cc (modified) (38 diffs)

factory/facFqBivar.cc

@@ -793 +793 @@
   CanonicalForm gamma= info.getGamma();
   CanonicalForm delta= info.getDelta();
-  int k= info.getGFDegree();
   bool extension= info.isInExtension();
 
@@ -900 +899 @@
     {
       if (!IsZero (M (i,j)))
-        nonZero++;  
+        nonZero++;
     }
     if (nonZero != 1)
@@ -1018 +1017 @@
 {
   Variable y= Variable (2);
-  Variable x= Variable (1); 
+  Variable x= Variable (1);
   CanonicalForm yToL= power (y, liftBound);
   for (long i= 1; i <= N.NumCols(); i++)
@@ -1219 +1218 @@
     {
       CFList source, dest;
-      
+
       if (!isInExtension (buf2, gamma, k, delta, source, dest))
       {
@@ -1292 +1291 @@
 
 void
-extReconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const 
+extReconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const
                       CFList& factors, const int liftBound, int& factorsFound,
                       int*& factorsFoundIndex, mat_zz_p& N, bool beenInThres,
@@ -1664 +1663 @@
                       )
 {
-  bool GF= (CFFactory::gettype () == GaloisFieldDomain);
   CanonicalForm LCF= LC (F, 1);
   CFArray *A= new CFArray [factors.length() - 1];
@@ -1774 +1772 @@
                            )
 {
-  bool GF= (CFFactory::gettype () == GaloisFieldDomain);
   CanonicalForm LCF= LC (F, 1);
   CFArray *A= new CFArray [factors.length() - 1];
@@ -1951 +1948 @@
       if (isReduced (NTLN))
       {
-        int d= degree (F) + 1;
         int * factorsFoundIndex= new int [NTLN.NumCols()];
         for (long i= 0; i < NTLN.NumCols(); i++)
@@ -2075 +2071 @@
       if (isReduced (NTLN))
       {
-        int d= degree (F) + 1;
         int * factorsFoundIndex= new int [NTLN.NumCols()];
         for (long i= 0; i < NTLN.NumCols(); i++)
@@ -2263 +2258 @@
       if (isReduced (NTLN))
       {
-      int d= degree (F) + 1;
       int * factorsFoundIndex= new int [NTLN.NumCols()];
       for (long i= 0; i < NTLN.NumCols(); i++)
@@ -2505 +2499 @@
       if (isReduced (NTLN))
       {
-        int d= degree (F) + 1;
         int * factorsFoundIndex= new int [NTLN.NumCols()];
         for (long i= 0; i < NTLN.NumCols(); i++)
@@ -2629 +2622 @@
     if (degree (bufF) + 1 + degree (LC (bufF, 1)) < oldL && result.length() > 0)
     {
-      F= bufF; 
+      F= bufF;
       factors= bufUniFactors;
       delete [] A;
@@ -2725 +2718 @@
     if (degree (bufF) + 1 + degree (LC (bufF, 1)) < l && result.length() > 0)
     {
-      F= bufF; 
+      F= bufF;
       factors= bufUniFactors;
       delete [] A;
@@ -2770 +2763 @@
   CanonicalForm primElemAlpha= info.getGamma();
   CanonicalForm imPrimElemAlpha= info.getDelta();
-  bool reduced= false;
   if (NTLN.NumRows() != factors.length()) //refined factors
     ident (NTLN, factors.length());
@@ -2787 +2779 @@
       imBasis= imBasis (power (y, degMipo), y);
       imBasis= imBasis (y, gamma);
-      int ind= oldL*degMipo - 1;
       CFIterator iter= imBasis;
       for (; iter.hasTerms(); iter++)
@@ -2801 +2792 @@
     {
       for (int i= 0; i < factors.length(); i++, j++)
-        A[i]= logarithmicDerivative (F, j.getItem(), oldL, oldL2, bufQ[i], 
+        A[i]= logarithmicDerivative (F, j.getItem(), oldL, oldL2, bufQ[i],
                                      bufQ[i]);
     }
@@ -2894 +2885 @@
     if (degree (bufF) + 1 + degree (LC (bufF, 1)) < l && result.length() > 0)
     {
-      F= bufF; 
+      F= bufF;
       factors= bufUniFactors;
       return result;
@@ -3013 +3004 @@
     if (degree (bufF) + 1 + degree (LC (bufF, 1)) < l && result.length() > 0)
     {
-      F= bufF; 
+      F= bufF;
       factors= bufUniFactors;
       delete [] A;
@@ -3320 +3311 @@
   int stepSize= 8;
   l += tmax (tmin (8, degree (F) + 1 + degree (LC (F, 1))-l),2);
-  bool reduced= false;
   Variable gamma= info.getBeta();
   CanonicalForm primElemAlpha= info.getGamma();
@@ -3512 +3502 @@
   int stepSize= 8; //TODO choose better step size?
   l += tmax (tmin (8, degree (F) + 1 + degree (LC (F, 1))-l), 2);
-  bool reduced= false;
   if (NTLN.NumRows() != factors.length()) //refined factors
     ident (NTLN, factors.length());
@@ -3660 +3649 @@
   Variable y= Variable (2);
   CanonicalForm LCF= LC (F, 1);
-  for (long i= 1; i <= NTLN.NumCols(); i++) 
+  for (long i= 1; i <= NTLN.NumCols(); i++)
   {
     CFListIterator iter= factors;
@@ -3889 +3878 @@
 
 CFList
-sieveSmallFactors (const CanonicalForm& G, CFList& uniFactors, DegreePattern& 
+sieveSmallFactors (const CanonicalForm& G, CFList& uniFactors, DegreePattern&
                    degPat, CanonicalForm& H, CFList& diophant, CFArray& Pi,
                    CFMatrix& M, bool& success, int d
@@ -3916 +3905 @@
   }
   int sizeOldF= size (F);
-  int sizeF;
   CFList result;
   CanonicalForm bufF= F;
@@ -3970 +3958 @@
   CanonicalForm shiftedF= F (y - evaluation, y);
   int sizeOldF= size (shiftedF);
-  int sizeF;
   CFList result;
   CanonicalForm bufF= shiftedF;
@@ -4120 +4107 @@
       ident (NTLNe, bufUniFactors.length() - 1);
   }
-  bool wasInBounds= false;
   bool irreducible= false;
   CFArray bufQ= CFArray (bufUniFactors.length() - 1);
@@ -4243 +4229 @@
     if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
     {
-      factorsFoundIndex= new int [NTLN.NumCols()]; 
+      factorsFoundIndex= new int [NTLN.NumCols()];
       for (long i= 0; i < NTLN.NumCols(); i++)
         factorsFoundIndex[i]= 0;
@@ -4249 +4235 @@
     else
     {
-      factorsFoundIndex= new int [NTLNe.NumCols()]; 
+      factorsFoundIndex= new int [NTLNe.NumCols()];
       for (long i= 0; i < NTLNe.NumCols(); i++)
         factorsFoundIndex[i]= 0;
@@ -4293 +4279 @@
       if (NTLN.NumCols() < bufUniFactors.length())
       {
-        refineAndRestartLift (F, NTLN, liftBound, l, bufUniFactors, M, Pi, 
+        refineAndRestartLift (F, NTLN, liftBound, l, bufUniFactors, M, Pi,
                               diophant
                              );
@@ -4482 +4468 @@
     if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
     {
-      if (result.length()== NTLN.NumCols()) 
+      if (result.length()== NTLN.NumCols())
       {
         delete [] bounds;
@@ -4491 +4477 @@
     else
     {
-      if (result.length()== NTLNe.NumCols()) 
+      if (result.length()== NTLNe.NumCols())
       {
         delete [] bounds;
@@ -4524 +4510 @@
       if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
       {
-        if (result.length() == NTLN.NumCols()) 
+        if (result.length() == NTLN.NumCols())
         {
           delete [] bounds;
@@ -4533 +4519 @@
       else
       {
-        if (result.length() == NTLNe.NumCols()) 
+        if (result.length() == NTLNe.NumCols())
         {
           delete [] bounds;
@@ -4640 +4626 @@
                               )
 {
-  bool GF= (CFFactory::gettype()==GaloisFieldDomain);
   CanonicalForm evaluation= eval;
   ExtensionInfo info= extInfo;
@@ -4766 +4751 @@
 
   ident (NTLN, bufUniFactors.length() - 1);
-  bool wasInBounds= false;
   bool irreducible= false;
   CFArray bufQ= CFArray (bufUniFactors.length() - 1);
@@ -4841 +4825 @@
   {
     int * factorsFoundIndex;
-      factorsFoundIndex= new int [NTLN.NumCols()]; 
+      factorsFoundIndex= new int [NTLN.NumCols()];
       for (long i= 0; i < NTLN.NumCols(); i++)
         factorsFoundIndex[i]= 0;
@@ -4989 +4973 @@
                                 );
 
-    if (result.length()== NTLN.NumCols()) 
+    if (result.length()== NTLN.NumCols())
     {
       delete [] bounds;
@@ -5004 +4988 @@
                                                      dest
                                                     );
-      if (result.length()== NTLN.NumCols()) 
+      if (result.length()== NTLN.NumCols())
       {
         delete [] bounds;
@@ -5415 +5399 @@
     CFList earlyFactors;
     TIMING_START (fac_hensel_lift);
-    uniFactors= henselLiftAndEarly 
+    uniFactors= henselLiftAndEarly
                (A, earlySuccess, earlyFactors, degs, liftBound,
                 uniFactors, info, evaluation);