Changeset f3703e in git

Timestamp:

Feb 21, 2014, 6:05:20 PM (10 years ago)

Author:

Max Horn <max@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

654726fdd2ca289b1ef3cbf4e931a1502bf145ef

Parents:

2e2f8fd86ee1b100bc0848cbffdbdc7fd2ced7d6

git-author:

Max Horn <max@quendi.de>2014-02-21 18:05:20+01:00

git-committer:

Max Horn <max@quendi.de>2014-02-21 18:05:34+01:00

Message:

Remove some dead code and unused variables

Files:

• Singular/walk.cc (modified) (3 diffs)
• kernel/khstd.cc (modified) (1 diff)
• libpolys/polys/clapsing.cc (modified) (1 diff)
• libpolys/polys/linalg_from_matpol.cc (modified) (2 diffs)
• libpolys/polys/matpol.cc (modified) (3 diffs)
• libpolys/polys/monomials/p_polys.cc (modified) (1 diff)
• libpolys/polys/simpleideals.cc (modified) (2 diffs)

Singular/walk.cc

@@ -4611 +4611 @@
   clock_t tim;
   nstep=0;
-  int i,k,nwalk,endwalks = 0;
+  int i,nwalk,endwalks = 0;
   int nV = currRing->N;
 
@@ -4696 +4696 @@
     else
     {
-    NORMAL_GW:
 #ifndef  BUCHBERGER_ALG
       if(isNolVector(curr_weight) == 0)
@@ -6790 +6789 @@
   clock_t tinput = clock();
 #endif
-  int nsteppert=0, i, k, nV = currRing->N, nwalk=0, npert_tmp=0;
+  int nsteppert=0, i, nV = currRing->N, nwalk=0, npert_tmp=0;
   int *npert=(int*)omAlloc(2*nV*sizeof(int));
   ideal Gomega, M,F,  G1, Gomega1, Gomega2, M1, F1;

kernel/khstd.cc

@@ -155 +155 @@
 #if ADIDEBUG
 PrintS("\nOriginal\n");
-int   j, l, k;
+int   i, j, l, k;
   if (hilb == NULL)
     return;

libpolys/polys/clapsing.cc

@@ -1464 +1464 @@
   On(SW_SYMMETRIC_FF);
   CFList L;
-  poly p;
   if (rField_is_Q(r) || rField_is_Zp(r))
   {

libpolys/polys/linalg_from_matpol.cc

@@ -7 +7 @@
 
 static void mp_PartClean(matrix, int, int, const ring);
-static void mp_FinalClean(matrix, const ring);
 static int mp_PrepareRow (matrix, int, int, const ring);
 static int mp_PreparePiv (matrix, int, int, const ring);
@@ -231 +230 @@
 
 
+static poly minuscopy (poly p, const ring R)
+{
+  poly w;
+  number  e;
+  e = n_Init(-1, R);
+  w = p_Copy(p, R);
+  p_Mult_nn(w, e, R);
+  n_Delete(&e, R);
+  return w;
+}
+
 
 /*2

libpolys/polys/matpol.cc

@@ -610 +610 @@
 }
 
-static poly minuscopy (poly p, const ring R)
-{
-  poly w;
-  number  e;
-  e = n_Init(-1, R);
-  w = p_Copy(p, R);
-  p_Mult_nn(w, e, R);
-  n_Delete(&e, R);
-  return w;
-}
-
 /*2
 * insert a monomial into a list, avoid duplicates
@@ -727 +716 @@
     for (j=lc-1;j>=0;j--) if(q1[j]) p_Delete(&q1[j], R);
   }
-}
-
-static void mp_FinalClean(matrix a, const ring)
-{
-  omFreeSize((ADDRESS)a->m,a->nrows*a->ncols*sizeof(poly));
-  omFreeBin((ADDRESS)a, sip_sideal_bin);
 }
 
@@ -1368 +1351 @@
 }
 
-static inline BOOLEAN smSmaller(poly a, poly b)
-{
-  loop
-  {
-    pIter(b);
-    if (b == NULL) return TRUE;
-    pIter(a);
-    if (a == NULL) return FALSE;
-  }
-}
-
-static BOOLEAN sm_IsNegQuot(poly a, const poly b, const poly c, const ring R)
-{
-  if (p_LmDivisibleByNoComp(c, b, R))
-  {
-    p_ExpVectorDiff(a, b, c, R);
-    // Hmm: here used to be a pSetm(a): but it is unnecessary,
-    // if b and c are correct
-    return FALSE;
-  }
-  else
-  {
-    int i;
-    for (i=rVar(R); i>0; i--)
-    {
-      if(p_GetExp(c,i,R) > p_GetExp(b,i,R))
-        p_SetExp(a,i,p_GetExp(c,i,R)-p_GetExp(b,i,R),R);
-      else
-        p_SetExp(a,i,0,R);
-    }
-    // here we actually might need a pSetm, if a is to be used in
-    // comparisons
-    return TRUE;
-  }
-}
-
 static void mp_ElimBar(matrix a0, matrix re, poly div, int lr, int lc, const ring R)
 {

libpolys/polys/monomials/p_polys.cc

@@ -2814 +2814 @@
   assume( r != NULL ); assume( r->cf != NULL ); const coeffs C = r->cf;
 
-  poly start=ph;
-
-  number d, h;
+  number h;
   poly p;
 

libpolys/polys/simpleideals.cc

@@ -34 +34 @@
 static int idpowerpoint;
 /*index of the actual monomial in idpower*/
-static poly * givenideal;
-/*the ideal from which a power is computed*/
 
 /*2
@@ -997 +995 @@
 }
 
-/*2
-*computes recursively all generators of a certain degree
-*of the ideal "givenideal"
-*elms is the number elements in the given ideal
-*actelm is the actual element to handle
-*deg is the degree of the power to compute
-*gendeg is the actual degree of the generator in consideration
-*/
-static void makepotence(int elms,int actelm,int deg,int gendeg, const ring r)
-{
-  poly p;
-  int i=0;
-
-  if ((idpowerpoint == 0) && (actelm ==1))
-  {
-    idpower[idpowerpoint] = p_One(r);
-    gendeg = 0;
-  }
-  while (i<=deg)
-  {
-    if (deg == gendeg)
-    {
-      idpowerpoint++;
-      return;
-    }
-    if (actelm == elms)
-    {
-      p=p_Power(p_Copy(givenideal[actelm-1],r),deg-gendeg,r);
-      idpower[idpowerpoint]=p_Mult_q(idpower[idpowerpoint],p,r);
-      idpowerpoint++;
-      return;
-    }
-    else
-    {
-      p = p_Copy(idpower[idpowerpoint],r);
-      makepotence(elms,actelm+1,deg,gendeg,r);
-      idpower[idpowerpoint] = p;
-    }
-    gendeg++;
-    idpower[idpowerpoint]=p_Mult_q(idpower[idpowerpoint],p_Copy(givenideal[actelm-1],r),r);
-    i++;
-  }
-}
-
-/*2
-*returns the deg-th power of the ideal gid
-*/
-//ideal idPower(ideal gid,int deg)
-//{
-//  int i;
-//  ideal id;
-//
-//  if (deg < 1) deg = 1;
-//  i = binom(IDELEMS(gid)+deg-1,deg);
-//  id=idInit(i,1);
-//  idpower = id->m;
-//  givenideal = gid->m;
-//  idpowerpoint = 0;
-//  makepotence(IDELEMS(gid),1,deg,0);
-//  idpower = NULL;
-//  givenideal = NULL;
-//  idpowerpoint = 0;
-//  return id;
-//}
 static void id_NextPotence(ideal given, ideal result,
   int begin, int end, int deg, int restdeg, poly ap, const ring r)