Changeset 69672d in git

Timestamp:

Feb 16, 2012, 4:28:20 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

46eef0a30be9c81870e8f7f971a5e0748c9e8fcd

Parents:

820046999d8c05256ea9302b64edf55a7cf83946

Message:

fix: pardeg

Files:

• Singular/iparith.cc (modified) (11 diffs)
• Singular/ipshell.cc (modified) (18 diffs)
• libpolys/polys/ext_fields/algext.h (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (1 diff)
• libpolys/polys/ext_fields/transext.h (modified) (1 diff)

Singular/iparith.cc

@@ -24 +24 @@
 #include <kernel/febase.h>
 #include <Singular/sdb.h>
-//#include <polys/ext_fields/longalg.h>
-//#include <polys/ext_fields/longtrans.h>
 #include <kernel/ideals.h>
 #include <polys/prCopy.h>
@@ -34 +32 @@
 #include <kernel/preimage.h>
 
-#include <polys/monomials/ring.h>
 #include <Singular/subexpr.h>
 #include <Singular/lists.h>
@@ -223 +220 @@
 {
   return pHead(p);
-} 
+}
 
 int iiTokType(int op)
@@ -531 +528 @@
   poly u_p=(poly)u->CopyD(POLY_CMD);
   if ((u_p!=NULL)
-  && ((v_i!=0) && 
+  && ((v_i!=0) &&
       ((long)pTotaldegree(u_p) > (signed long)currRing->bitmask / (signed long)v_i)))
   {
@@ -1342 +1339 @@
   poly r=p; // pointer to the beginning of component i
   poly o=NULL;
-  int i=(int)(long)v->Data();
+  unsigned i=(unsigned)(long)v->Data();
   while (p!=NULL)
   {
@@ -1380 +1377 @@
       for(i=0;i<iv->length();i++)
       {
-        if (pGetComp(p)==(*iv)[i])
+        if (((int)pGetComp(p))==(*iv)[i])
         {
           poly h;
@@ -2070 +2067 @@
         int r_par=0;
         char ** r_par_names=NULL;
-        if (r->cf->extRing!=NULL) 
+        if (r->cf->extRing!=NULL)
         {
           r_par=r->cf->extRing->N;
@@ -2077 +2074 @@
         int c_par=0;
         char ** c_par_names=NULL;
-        if (currRing->cf->extRing!=NULL) 
+        if (currRing->cf->extRing!=NULL)
         {
           c_par=currRing->cf->extRing->N;
@@ -2810 +2807 @@
   assumeStdFlag(v);
   ideal ui=(ideal)u->Data();
-  idTest(ui);
   ideal vi=(ideal)v->Data();
-  idTest(vi);
   res->data = (char *)kNF(vi,currQuotient,ui);
   return FALSE;
@@ -4280 +4275 @@
     };
     typedef struct snumber_dummy  *number_dummy;
- 
+
     number_dummy z=(number_dummy)omAlloc(sizeof(snumber_dummy));
     #if defined(LDEBUG)
@@ -4448 +4443 @@
   return FALSE;
 }
-static BOOLEAN jjPARDEG(leftv res, leftv)
-{
-  if (rField_is_Extension(currRing))
-  {
-    res->data = (char *)(long)currRing->cf->extRing->pFDeg(
-        currRing->cf->extRing->qideal->m[0],
-        currRing->cf->extRing);
-  }
-  else
-    res->data = (char *)0L;
+static BOOLEAN jjPARDEG(leftv res, leftv v)
+{
+  res->data = (char *)0L;
+  number nn=(number)v->Data();
+  if (nn!=NULL) 
+  {
+    if (getCoeffType(currRing->cf)==n_algExt)
+    {
+      poly qq=(poly)nn;
+      res->data = (char *)(long)currRing->cf->extRing->pFDeg(qq,
+        currRing->cf->extRing);
+    }
+    if(getCoeffType(currRing->cf)==n_transExt)
+    {
+      /* from transext.h:*/
+      struct fractionObject
+      {
+        poly numerator;
+        poly denominator;
+        int complexity;
+      };
+      typedef struct fractionObject * fraction;
+      #define NUM(f) (((fraction)f)->numerator)
+
+      fraction qq=(fraction)nn;
+      res->data = (char *)(long)currRing->cf->extRing->pFDeg(NUM(qq),
+        currRing->cf->extRing);
+    }
+  }
   return FALSE;
 }

Singular/ipshell.cc

@@ -609 +609 @@
 int IsPrime(int p)  /* brute force !!!! */
 {
-  int i,j;
   if      (p == 0)    return 0;
   else if (p == 1)    return 1/*1*/;
@@ -618 +617 @@
 }
 
-BOOLEAN iiWRITE(leftv res,leftv v)
+BOOLEAN iiWRITE(leftv,leftv v)
 {
   sleftv vf;
@@ -1552 +1551 @@
 }
 
-idhdl rFindHdl(ring r, idhdl n, idhdl w)
+idhdl rFindHdl(ring r, idhdl n, idhdl)
 {
   idhdl h=rSimpleFindHdl(r,IDROOT,n);
@@ -2427 +2426 @@
         int par_perm_size=0;
         nMapFunc nMap;
-        BOOLEAN bo;
 
         if ((nMap=nSetMap(orig_ring->cf))==NULL)
@@ -3077 +3075 @@
   int     z  = 0;          // number of spectral number equal to smax
 
-  int     k = 0;
-
   while( (*node)!=(spectrumPolyNode*)NULL &&
          ( fast==0 || (*node)->weight<=smax ) )
@@ -3304 +3300 @@
 spectrumState   spectrumCompute( poly h,lists *L,int fast )
 {
-  int i,j;
+  int i;
 
   #ifdef SPECTRUM_DEBUG
@@ -4205 +4201 @@
   int deg= currRing->pLDeg( gls, &ldummy, currRing );
   //  int deg= pDeg( gls );
-  int len= pLength( gls );
+  //  int len= pLength( gls );
   int i,vpos=0;
   poly piter;
@@ -4265 +4261 @@
 
   int elem= roots->getAnzRoots();
-  char *out;
   char *dummy;
   int j;
@@ -4466 +4461 @@
   int i,c,count;
   lists listofroots= NULL;
-  lists emptylist;
   number smv= NULL;
   BOOLEAN interpolate_det= (mtype==uResultant::denseResMat)?TRUE:FALSE;
@@ -4567 +4561 @@
 lists listOfRoots( rootArranger* self, const unsigned int oprec )
 {
-  int i,j,tr;
+  int i,j;
   int count= self->roots[0]->getAnzRoots(); // number of roots
   int elem= self->roots[0]->getAnzElems();  // number of koordinates per root
@@ -4614 +4608 @@
 void rSetHdl(idhdl h)
 {
-  int i;
   ring rg = NULL;
   if (h!=NULL)
@@ -4954 +4947 @@
   int float_len2=0;
   ring R = NULL;
-  idhdl tmp = NULL;
   BOOLEAN ffChar=FALSE;
-  int typ = 1;
 
   /* ch -------------------------------------------------------*/
   // get ch of ground field
-  int numberOfAllocatedBlocks;
 
   // allocated ring
@@ -5037 +5027 @@
   {
     BOOLEAN complex_flag=(strcmp(pn->name,"complex")==0);
-    const int ch=0;
     if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
     {
@@ -5110 +5099 @@
     if (modExponent > 1)
     {
-      const int ch = modExponent;
       if ((mpz_cmp_ui(modBase, 2) == 0) && (modExponent <= 8*sizeof(NATNUMBER)))
       {
@@ -5156 +5144 @@
     while (p != NULL)
     {
-      Print( "pn[%p]: type: %d [%s]: %p, name: %s", p, p->Typ(), Tok2Cmdname(p->Typ()), p->Data(), (p->name == NULL? "NULL" : p->name) );
+      Print( "pn[%p]: type: %d [%s]: %p, name: %s", (void*)p, p->Typ(), Tok2Cmdname(p->Typ()), p->Data(), (p->name == NULL? "NULL" : p->name) );
       PrintLn();
       p = p->next;
@@ -5165 +5153 @@
 //  pn=pn->next;
 
-  int l, last;
-  sleftv * sl;
+  int l;
   /*every entry in the new ring is initialized to 0*/
 
@@ -5267 +5254 @@
   ring R = rCopy0(org_ring);
   int *perm=(int *)omAlloc0((org_ring->N+1)*sizeof(int));
-  int last = 0, o=0, n = rBlocks(org_ring), i=0, typ = 1, j;
+  int n = rBlocks(org_ring), i=0, j;
 
   /* names and number of variables-------------------------------------*/
@@ -5437 +5424 @@
       r->qideal = NULL;
     }
-    int i=1;
     int j;
-    int *pi=r->order;
 #ifdef USE_IILOCALRING
     for (j=0;j<iiRETURNEXPR_len;j++)

libpolys/polys/ext_fields/algext.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
 /*
 * ABSTRACT: numbers in an algebraic extension field K[a] / < f(a) >

libpolys/polys/ext_fields/transext.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
 /*
 * ABSTRACT: numbers in a rational function field K(t_1, .., t_s) with

libpolys/polys/ext_fields/transext.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
 /*
 * ABSTRACT: numbers in a rational function field K(t_1, .., t_s) with