Changeset 8a5c49 in git

Timestamp:

Aug 12, 2011, 2:07:54 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

7fccc79116395e52484b519fc379d165d8cf6bc2

Parents:

95eb6d00149ac8549074f366eba29162578e4ead

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-08-12 14:07:54+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:21:27+01:00

Message:

fix ipassign.cc, extra.cc

Files:

• Singular/ipassign.cc (modified) (4 diffs)
• Singular/table.h (modified) (1 diff)
• kernel/mod2.h (modified) (1 diff)
• libpolys/coeffs/coeffs.h (modified) (1 diff)

Singular/ipassign.cc

@@ -142 +142 @@
       ideal I=(ideal)IDDATA(h);
       for(i=IDELEMS(I)-1;i>=0;i--)
-              I->m[i]=p_MinPolyNormalize(I->m[i], currRing);
+             I->m[i]=p_MinPolyNormalize(I->m[i], currRing);
       break;
     }
@@ -161 +161 @@
 static BOOLEAN jjMINPOLY(leftv res, leftv a)
 {
+  if (getCoeffType(currRing->cf)!=n_transExt)
+  {
+      WerrorS("no minpoly allowed");
+      return TRUE;
+  }
   number p=(number)a->CopyD(NUMBER_CMD);
   if (nIsZero(p))
   {
-    currRing->minpoly=NULL;
-    naMinimalPoly=NULL;
+    WerrorS("cannot set minpoly to 0");
+    return TRUE;
   }
   else
   {
-    if ((rPar(currRing)!=1)
-      || (rField_is_GF(currRing)))
-    {
-      WerrorS("no minpoly allowed");
+    // remove all object currently in the ring
+    while(currRing->idroot!=NULL)
+    {
+      killhdl2(currRing->idroot,&(currRing->idroot),currRing);
+    }
+    nNormalize(p);
+    typedef struct { ring r; ideal i; } AlgExtInfo;
+    struct fractionObject
+    {
+      poly numerator;
+      poly denominator;
+      int complexity;
+    };
+    typedef struct fractionObject * fraction;
+
+    AlgExtInfo A;
+    A.r=currRing->cf->extRing;
+    A.r->ref++;
+    A.i=idInit(1,1);
+    A.i->m[0]=((fraction)p)->numerator;
+    ((fraction)p)->numerator=NULL;
+    n_Delete(&p,currRing->cf);
+    coeffs new_cf=nInitChar(n_algExt,&A);
+    if (new_cf==NULL)
+    {
+      Werror("llegal minpoly");
+      // cleanup A: TODO
       return TRUE;
     }
-    if (currRing->minpoly!=NULL)
-    {
-      WerrorS("minpoly already set");
-      return TRUE;
-    }
-    nNormalize(p);
-    currRing->minpoly=p;
-    naMinimalPoly=((lnumber)currRing->minpoly)->z;
-    if (p_GetExp(((lnumber)currRing->minpoly)->z,1,currRing->extRing)==0)
-    {
-      Werror("minpoly must not be constant");
-      currRing->minpoly=NULL;
-      naMinimalPoly=NULL;
-      nDelete(&p);
-    }
-    /* redefine function pointers due to switch from
-       transcendental to algebraic field extension */
-    //redefineFunctionPointers();
-    // and now, normalize all already defined objects in this ring
-    idhdl h=currRing->idroot;
-    while(h!=NULL)
-    {
-      jjMINPOLY_red(h);
-      h=IDNEXT(h);
+    else
+    {
+      nKillChar(currRing->cf);
+      currRing->cf=new_cf;
     }
   }
@@ -300 +308 @@
 {
   number p=(number)a->CopyD(BIGINT_CMD);
-  if (res->data!=NULL) nlDelete((number *)&res->data,NULL);
+  if (res->data!=NULL) n_Delete((number *)&res->data,coeffs_BIGINT);
   res->data=(void *)p;
   jiAssignAttr(res,a);
@@ -1054 +1062 @@
       {
         Warn("expression list length(%d) does not match intmat size(%d)",
-              iv->length()+exprlist_length(hh),iv->length());
+             iv->length()+exprlist_length(hh),iv->length());
       }
       break;

Singular/table.h

@@ -1196 +1196 @@
 ,{D(jjCOLMAX),     VCOLMAX,        INT_CMD }
 ,{D(jjTIMER),      VTIMER,         INT_CMD }
+#ifdef HAVE_GETTIMEOFDAY
 ,{D(jjRTIMER),     VRTIMER,        INT_CMD }
+#endif
 ,{D(jjMAXDEG),     VMAXDEG,        INT_CMD }
 ,{D(jjMAXMULT),    VMAXMULT,       INT_CMD }

kernel/mod2.h

@@ -24 +24 @@
  ******************************************************************/
 
+/*defines, which should be set by configure */
+#define HAVE_GETTIMEOFDAY 1
+#define TIME_WITH_SYS_TIME 1
+#define HAVE_SYS_TIME_H 1
 /* Default value for timer resolution in ticks per second */
 /* set to 10 for resolution of tenth of a second, etc */

libpolys/coeffs/coeffs.h

@@ -336 +336 @@
 /// !!! Recommendation: remove implementations for unordered fields
 /// !!!                 and raise errors instead, in these cases
+/// !!! Do not follow this recommendation: while writing polys,
+/// !!! between 2 monomials will be an additional + iff !n_GreaterZero(next coeff)
+///
 static inline BOOLEAN n_GreaterZero(number n, const coeffs r)
 {