Changeset 3693cf in git

Timestamp:

Feb 19, 2013, 9:45:45 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

5e42ec33c5a0d777cb71dc36d36924181f7d88b3

Parents:

fd60be56d6b370a06c2d461f568680391606dbc1236a4c0b334deb5ef1062f5eeac7f6bcaf807f35

Message:

Merge pull request #284 from YueRen/thurnau

Thurnau

Files:

• .gitignore (modified) (2 diffs)
• Makefile.am (modified) (3 diffs)
• Singular/MinorInterface.cc (modified) (2 diffs)
• Tst/New/bigints.res.gz.uu (modified) (1 diff)
• Tst/New/bigints.stat (modified) (1 diff)
• Tst/New/gf_imap.res.gz.uu (added)
• Tst/New/gf_imap.stat (added)
• Tst/New/gf_imap.tst (added)
• clone_autogen_generated_stuff.sh (added)
• kernel/ideals.cc (modified) (2 diffs)
• kernel/ideals.h (modified) (1 diff)
• libpolys/coeffs/shortfl.cc (modified) (6 diffs)
• libpolys/polys/ext_fields/transext.cc (modified) (3 diffs)
• m4/ax_python_with_version.m4 (modified) (1 diff)

.gitignore

@@ -10 +10 @@
 .libs
 doc/
+AUTOGEN_generated_stuff
 MOD
 libsingular-config
@@ -110 +111 @@
 stamp-h1
 stamp-h2
-
+test-driver
 singular.png

Makefile.am

@@ -15 +15 @@
 
 emacsdir=$(datadir)/emacs
-dist_emacs_DATA =  emacs/BUGS \
+EMACS = emacs/BUGS \
     emacs/ChangeLog \
     emacs/cmpl.pl \
@@ -27 +27 @@
     emacs/singular.xpm
 
+dist_emacs_DATA = $(EMACS)
+
 # emacs/test.sing
 # TODO: remove this!
@@ -33 +35 @@
 
 
-EXTRA_DIST = autogen.sh emacs
+EXTRA_DIST = autogen.sh $(EMACS)
 
 

Singular/MinorInterface.cc

@@ -190 +190 @@
   /* before we return the result, let's omit zero generators
      in iii which come after the computed minors */
-  ideal jjj;
-  if (collectedMinors == 0) jjj = idInit(1);
-  else                      jjj = idCopyFirstK(iii, collectedMinors);
-  idDelete(&iii);
+  idKeepFirstK(iii, collectedMinors);
   delete[] myColumnIndices;
   delete[] myRowIndices;
-  return jjj;
+  return(iii);
 }
 
@@ -542 +539 @@
     else
     { /* k == 0, i.e., all minors are requested */
-      int minorCount = 1;
-      for (int i = rowCount - minorSize + 1; i <= rowCount; i++)
-        minorCount = minorCount * i;
-      for (int i = 2; i <= minorSize; i++) minorCount = minorCount / i;
-      for (int i = columnCount - minorSize + 1; i <= columnCount; i++)
-        minorCount = minorCount * i;
-      for (int i = 2; i <= minorSize; i++) minorCount = minorCount / i;
-      /* now: minorCount =   (rowCount over minorSize)
-                           * (columnCount over minorSize) */
+      int minorCount = binom(rowCount, minorSize);
+      minorCount *= binom(columnCount, minorSize);
       if      ((minorSize >= 3) && (vars <= 4)
                && (minorCount >= 100))                           c = true;

Tst/New/bigints.res.gz.uu

@@ -1 +1 @@
 begin 664 bigints.res.gz
-M'XL(")$X(E$``V)I9VEN=',N<F5S`.V8VV[:0!"&[WF*">T%),1A;6-S4*C4
-M5JJ0FEXDZ6TJ@S=T%6,;>Z&MJKY[Q]CL#F='*9608B&PUS/_C'<^>Q;?W7\<
-M?`$`UH?/@_=0E:DT`C&L]@#WOHE0R%J]5\E^H=^'H1B+4*9&R'\8J?1DY:YP
-M-_N@]BT#XB0:P3U/T5D-VP;\5@<M`ZKG^[=J3UF[:)V(<-P%S&OHI3P[T*<[
-MA@K.F%$D"1Y<0V?GIKR91;Q;9!^#AK/)D"<0HI*G'3"<UX#JY65_:5!M0"JS
-MG&IA7=F9F$H<!;\@7G$W+>V^.*V=8^*,F<SY2$8)S%?=7>U>&&B!.1$@DV)A
-M)L+G7@"#%2V+I)*?UU(#+6616;$P_"3R9P&'FU4M,BN%@1:[T6(VTV(VF7H;
-M@UQ=058XL1!6B>&(5A+U7F861A+261Q'B>3^F=)PB1[F4]4(M4C8%H;]HPYL
-M36X+<\BBP"UF4&O6&[+AQ[T<X]Z3"`*X[54.4%O).:U@D@"C[U[BC23BFDHQ
-M@BXT\_$"F^@1YEZ2XCC+QQ?;,(A&3]D=B>-1XB]8!S\F%GKK0NA->)KMRBT2
-M)I7X4-E]-P"!><]-<TAAP?,+_`N@]RB<CWE88_5#0CG-+\BD0+A$)@H>AX#D
-M4I#,(X!DG@)(K!PO!\V66#RK]@=5ER5>KV.[3VIG-Z8OK]X;&"?1+/3A4?#`
-MQZFT\_$X$1,AQ9P##_B$XX.N"]/\U$2$^>0LR\/.IP_F1?;-%M\G\20Y30`Z
-M^D9VFKIM.&RE._P+,';U!P8QGIAPF4UB5ILI[,#B)##8;?;:4#8S4;R1-;5#
-M5DJ.O9W#@HWK*3XFUJ#$)=,[W/XSF[4LD_HKH/O\3QK0%@'4(8"29;C3)OOD
-M+XG;I!`GF/LQGJ:%\BD@R(Q6Q^(7K"1QI<V7@"F'Y_%4.LX2GXTXJN*LOU;Q
-MAM7$S_'JWK6:X(NQD&D#/-_'E584XC6IT9/@8K?9ZZ-I,Q,%FTEA&T63..`_
-MCT-:(=YUMK'FK**VT3O%SMXI'DZE>38-QB],MQR.)8V7[!7FSP.M9(PE56LQ
-M%$*6[FZN33H7>1OFDJ[GDJ[GDJ[GDJ[7)G\GVFSQPDM3*D+)QSS92FEF^?[K
-MI[,S]:ZK;6YW;]@[!9!*&2E_LJ)LD\MKX^5E;WZSM[NS%">D][;R%^$?E9PD
-#%@``
+M'XL("-YF(U$``V)I9VEN=',N<F5S`.V8VV[:0!"&[WF*">T%),3Q"9M@A4IM
+MI0JIZ462WJ8R>$-7,;:Q%]JJZKMWC,WN<#`X2E,)*18">SWSSWCGLV?Q[=W'
+MX1<`,`;P>?@>FB(36LA'30]P[QN/N&BUO4;^"X,!C/B$1R+3(O9#RX0O&K>E
+MNSD`N6]ID*3Q&.Y8ALYRV-;@MSSH:M`\W;\U/6GMHG7*HTD?,*^1G['\0)V^
+MU&1PP]#*),&'*[BLW*2W81'O+MG'H-%\.F(I1*CD*P<,YW>@>7X^6!DT.Y")
+M/*=6U)9V)J:2Q.$O2-;<34NY+T\KYX0X8R8+-A9Q"HMU=U>YEP9*8$$$R*18
+MF`D/F!_"<$W+(JD4YY744$E99%8L##^-@WG(X'I=B\Q*::#$KI68;2@QFTR]
+MC4$N+B`O'%\*R\1P1"GQMI>;1;&`;)XD<2I8<"(U7**'^3050ET2MHMA_\@#
+M6Y';Q1SR*'"#&;3T=D=T@L0K,/8>>1C"C=<X0&VCX+2!20*,O_NI/Q:(:R;X
+M&/J@%^,E-O$#+/PTPW&C&%]NHS`>/^9W)([':;!D'8*$6*BM#Y$_95F^*W9(
+MF%3B0Z/Z;@`"\YZ;YI#"DN=G^)=`[U$XG;"H9;0/"14T/R.3$N$:F4AX'`*2
+M2T$R7P`D\QA`,NKQ<M!LA<63:G]0=57BS3KV!J1V=F?V_.J]@4D:SZ,`'C@+
+M`YQ*NQA/4C[E@B\8L)!-&3[H^C`K3DUY5$S.JCS&Z>S>/,N_C>7W43Q)CA.`
+M2W4C.[IJ&XZQUAW^!1A5_<&`!$],F<@G,:_-#"JP.`H,JLU>&\IV)I(WLJ9V
+MR$K)L7=S6+)Q-</'Q`:4N&1ZA]M_9K.59])^!72?_U$#VB6`.@10L@QW>F2?
+M_"5Q=0IQBKF_Q-.T5#X&!`U-UW5V9CHU6V9=\Q5@TN%I/-6.L\)G*XZLN#'8
+MJ'C'TO'S<G7O6SH$?,)%U@$_"'"E%4=X37+T*+BH-GM]-&UG(F$S*6SC>)J$
+M[.?+D%:*]YU=K#GKJ&WU3E[9._G]L31/73/P?G?KX5C3>,5>:?XTT&K&6%&U
+M$4,B9*GNYMJD<Y&W82[I>B[I>B[I>B[I>CWR=Z)G+%]X*4IY)-B$I3LIS2W?
+M?_UT<B+?=?7,W>X=NU(`J12Q]"<KRAZYO!Y>7O[F-W^[.\]P0KRWC;_,83;Q
+$)!8`````
 `
 end

Tst/New/bigints.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1361197201:0- spielwiese :spielwiese:version:mandelbrot:100568
-1 >> tst_memory_1 :: 1361197201:0- spielwiese :spielwiese:version:mandelbrot:2215936
-1 >> tst_memory_2 :: 1361197201:0- spielwiese :spielwiese:version:mandelbrot:2215936
-1 >> tst_timer_1 :: 1361197201:0- spielwiese :spielwiese:version:mandelbrot:2
+1 >> tst_memory_0 :: 1361274590:3.1.3.sw $Id$:spielwiese:version:thinktank:97040
+1 >> tst_memory_1 :: 1361274590:3.1.3.sw $Id$:spielwiese:version:thinktank:2236416
+1 >> tst_memory_2 :: 1361274590:3.1.3.sw $Id$:spielwiese:version:thinktank:2236416
+1 >> tst_timer_1 :: 1361274590:3.1.3.sw $Id$:spielwiese:version:thinktank:4

kernel/ideals.cc

@@ -11 +11 @@
 
 #include <omalloc/omalloc.h>
-#include <misc/auxiliary.h>
-
 
 #ifndef NDEBUG
@@ -2559 +2557 @@
 */
 
-
-
+/// keeps the first k (>= 1) entries of the given ideal
+/// (Note that the kept polynomials may be zero.)
+void idKeepFirstK(ideal id, const int k)
+{
+   for (int i = IDELEMS(id)-1; i >= k; i--)
+   {
+      if (id->m[i] != NULL) pDelete(&id->m[i]);
+   }
+   int kk=k;                                                                                                                 
+   if (k==0) kk=1; /* ideals must have at least one element(0)*/                                                             
+   pEnlargeSet(&(id->m), IDELEMS(id), kk-IDELEMS(id));                                                                       
+   IDELEMS(id) = kk; 
+}
+
+/*
+* compare the leading terms of a and b
+*/
+static int tCompare(const poly a, const poly b)
+{
+  if (b == NULL) return(a != NULL);
+  if (a == NULL) return(-1);
+
+  /* a != NULL && b != NULL */
+  int r = pLmCmp(a, b);
+  if (r != 0) return(r);
+  number h = nSub(pGetCoeff(a), pGetCoeff(b));
+  r = -1 + nIsZero(h) + 2*nGreaterZero(h);   /* -1: <, 0:==, 1: > */
+  nDelete(&h);
+  return(r);
+}
+
+/*
+* compare a and b (rev-lex on terms)
+*/
+static int pCompare(const poly a, const poly b)
+{
+  int r = tCompare(a, b);
+  if (r != 0) return(r);
+
+  poly aa = a;
+  poly bb = b;
+  while (r == 0 && aa != NULL && bb != NULL)
+  {
+    pIter(aa);
+    pIter(bb);
+    r = tCompare(aa, bb);
+  }
+  return(r);
+}
+
+typedef struct
+{
+  poly p;
+  int index;
+} poly_sort;
+
+int pCompare_qsort(const void *a, const void *b)
+{
+  int res = pCompare(((poly_sort *)a)->p, ((poly_sort *)b)->p);
+  return(res);
+}
+
+void idSort_qsort(poly_sort *id_sort, int idsize)
+{
+  qsort(id_sort, idsize, sizeof(poly_sort), pCompare_qsort);
+}
+
+/*2
+* ideal id = (id[i])
+* if id[i] = id[j] then id[j] is deleted for j > i
+*/
+void idDelEquals(ideal id)
+{
+  int idsize = IDELEMS(id);
+  poly_sort *id_sort = (poly_sort *)omAlloc0(idsize*sizeof(poly_sort));
+  for (int i = 0; i < idsize; i++)
+  {
+    id_sort[i].p = id->m[i];
+    id_sort[i].index = i;
+  }
+  idSort_qsort(id_sort, idsize);
+  int index, index_i, index_j;
+  int i = 0;
+  for (int j = 1; j < idsize; j++)
+  {
+    if (id_sort[i].p != NULL && pEqualPolys(id_sort[i].p, id_sort[j].p))
+    {
+      index_i = id_sort[i].index;
+      index_j = id_sort[j].index;
+      if (index_j > index_i)
+      {
+        index = index_j;
+      }
+      else
+      {
+        index = index_i;
+        i = j;
+      }
+      pDelete(&id->m[index]);
+    }
+    else
+    {
+      i = j;
+    }
+  }
+  omFreeSize((ADDRESS)(id_sort), idsize*sizeof(poly_sort));
+}

kernel/ideals.h

@@ -24 +24 @@
 }
 
+void idKeepFirstK(ideal ide, const int k);
+void idDelEquals(ideal id);
+
 /// delete an ideal
 inline void idDelete (ideal* h, ring r = currRing)

libpolys/coeffs/shortfl.cc

@@ -6 +6 @@
 * ABSTRACT:
 */
-
+#include <iostream>
 #include <coeffs/shortfl.h>
 
 #include <string.h>
+#include <math.h>
 #include <coeffs/coeffs.h>
 #include <coeffs/numbers.h>
@@ -373 +374 @@
   assume( getCoeffType(r) == ID );
   assume( getCoeffType(aRing) ==  n_Zp );
-  
+
   int i = (int)((long)from);
   float f = (float)i;
@@ -389 +390 @@
 
 static number nrMapC(number from, const coeffs aRing, const coeffs r)
-{  
+{
   assume( getCoeffType(r) == ID );
   assume( getCoeffType(aRing) == n_long_C );
-  
+
   gmp_float h = ((gmp_complex*)from)->real();
   float t =(float)mpf_get_d((mpf_srcptr)&h);
@@ -406 +407 @@
 */
 #define SR_HDL(A) ((long)(A))
-#define mpz_isNeg(A) ((A)->_mp_size<0)
-#define mpz_limb_size(A) ((A)->_mp_size)
-#define mpz_limb_d(A) ((A)->_mp_d)
-#define MPZ_DIV(A,B,C) mpz_tdiv_q((A),(B),(C))
 #define IS_INT(A) ((A)->s==3)
 #define IS_IMM(A) (SR_HDL(A)&SR_INT)
 #define GET_NOM(A) ((A)->z)
 #define GET_DENOM(A) ((A)->n)
-#define MPZ_INIT mpz_init
-#define MPZ_CLEAR mpz_clear
 
   assume( getCoeffType(r) == ID );
   assume( getCoeffType(aRing) == n_Q );
-
-  mpz_t h;
-  mpz_ptr g,z,n;
-  int i,j,t,s;
-  float ba,rr,rn,y;
 
   if (IS_IMM(from))
     return nf((float)nlInt(from,NULL /* dummy for nlInt*/)).N();
-  z=GET_NOM(from);
-  s=0X10000;
-  ba=(float)s;
-  ba*=ba;
-  rr=0.0;
-  i=mpz_size1(z);
+
+  /* read out the enumerator */
+  mpz_ptr z=GET_NOM(from);
+  if(mpz_size1(z)>4)
+  {
+    WerrorS("float overflow");
+    return nf(0.0).N();
+  }
+  mpf_t e;
+  mpf_init(e);
+  mpf_set_z(e,z);
+
+  /* if number was an integer, we are done*/
   if(IS_INT(from))
   {
-    if(i>4)
-    {
-      WerrorS("float overflow");
-      return nf(rr).N();
-    }
-    i--;
-    rr=(float)mpz_limb_d(z)[i];
-    while(i>0)
-    {
-      i--;
-      y=(float)mpz_limb_d(z)[i];
-      rr=rr*ba+y;
-    }
-    if(mpz_isNeg(z))
-      rr=-rr;
-    return nf(rr).N();
-  }
-  n=GET_DENOM(from);
-  j=s=mpz_limb_size(n);
-  if(j>i)
-  {
-    g=n; n=z; z=g;
-    t=j; j=i; i=t;
-  }
-  t=i-j;
-  if(t>4)
-  {
-    if(j==s)
-      WerrorS("float overflow");
-    return nf(rr).N();
-  }
-  if(t>1)
-  {
-    g=h;
-    MPZ_INIT(g);
-    MPZ_DIV(g,z,n);
-    t=mpz_size1(g);
-    if(t>4)
-    {
-      MPZ_CLEAR(g);
-      if(j==s)
-        WerrorS("float overflow");
-      return nf(rr).N();
-    }
-    t--;
-    rr=(float)mpz_limb_d(g)[t];
-    while(t)
-    {
-      t--;
-      y=(float)mpz_limb_d(g)[t];
-      rr=rr*ba+y;
-    }
-    MPZ_CLEAR(g);
-    if(j!=s)
-      rr=1.0/rr;
-    if(mpz_isNeg(z))
-      rr=-rr;
-    return nf(rr).N();
-  }
-  rn=(float)mpz_limb_d(n)[j-1];
-  rr=(float)mpz_limb_d(z)[i-1];
-  if(j>1)
-  {
-    rn=rn*ba+(float)mpz_limb_d(n)[j-2];
-    rr=rr*ba+(float)mpz_limb_d(z)[i-2];
-    i--;
-  }
-  if(t!=0)
-    rr=rr*ba+(float)mpz_limb_d(z)[i-2];
-  if(j==s)
-    rr=rr/rn;
-  else
-    rr=rn/rr;
-  if(mpz_isNeg(z))
-    rr=-rr;
-  return nf(rr).N();
-}
-
+    double basis;
+    signed long int exp;
+    basis = mpf_get_d_2exp(&exp, e);
+    float f = ldexp(basis,exp);
+    mpf_clear(e);
+    return nf(f).N();
+  }
+
+  /* else read out the denominator */
+  mpz_ptr n = GET_DENOM(from);
+  if(mpz_size1(n)>4)
+  {
+    WerrorS("float overflow");
+    mpf_clear(e);
+    return nf(0.0).N();
+  }
+  mpf_t d;
+  mpf_init(d);
+  mpf_set_z(d,n);
+
+  /* and compute the quotient */
+  mpf_t q;
+  mpf_init(q);
+  mpf_div(q,e,d);
+
+  double basis;
+  signed long int exp;
+  basis = mpf_get_d_2exp(&exp, q);
+  float f = ldexp(basis,exp);
+  mpf_clear(e);
+  mpf_clear(d);
+  mpf_clear(q);
+  return nf(f).N();
+}
 
 nMapFunc nrSetMap(const coeffs src, const coeffs dst)
@@ -544 +497 @@
 {
   assume( getCoeffType(n) == ID );
-   
+
   assume( p == NULL );
-   
+
   n->cfKillChar = ndKillChar; /* dummy */
   n->ch = 0;
@@ -578 +531 @@
   n->cfDBTest=ndDBTest; // not yet implemented: nrDBTest;
 #endif
-  
+
   n->nCoeffIsEqual = ndCoeffIsEqual;
 
   n->float_len = SHORT_REAL_LENGTH;
   n->float_len2 = SHORT_REAL_LENGTH;
-   
+
   // TODO: Any variables?
   return FALSE;

libpolys/polys/ext_fields/transext.cc

@@ -609 +609 @@
   ntTest(b);
   number aNumCoeff = NULL; int aNumDeg = -1;
+  number aDenCoeff = NULL; int aDenDeg = -1;
   number bNumCoeff = NULL; int bNumDeg = -1;
+  number bDenCoeff = NULL; int bDenDeg = -1;
   if (!IS0(a))
   {
@@ -615 +617 @@
     aNumDeg = p_Totaldegree(NUM(fa), ntRing);
     aNumCoeff = p_GetCoeff(NUM(fa), ntRing);
+    if (DEN(fa)!=NULL)
+    {
+      aDenDeg = p_Totaldegree(DEN(fa), ntRing);
+      aDenCoeff=p_GetCoeff(DEN(fa),ntRing);
+    }
   }
   else return !(ntGreaterZero (b,cf));
@@ -622 +629 @@
     bNumDeg = p_Totaldegree(NUM(fb), ntRing);
     bNumCoeff = p_GetCoeff(NUM(fb), ntRing);
+    if (DEN(fb)!=NULL)
+    {
+      bDenDeg = p_Totaldegree(DEN(fb), ntRing);
+      bDenCoeff=p_GetCoeff(DEN(fb),ntRing);
+    }
   }
   else return ntGreaterZero(a,cf);
-  if (aNumDeg > bNumDeg) return TRUE;
-  if (aNumDeg < bNumDeg) return FALSE;
-  return n_Greater(aNumCoeff, bNumCoeff, ntCoeffs);
+  if (aNumDeg-aDenDeg > bNumDeg-bDenDeg) return TRUE;
+  if (aNumDeg-aDenDeg < bNumDeg-bDenDeg) return FALSE;
+  number aa;
+  number bb;
+  if (bDenCoeff==NULL) aa=n_Copy(aNumCoeff,ntRing->cf);
+  else                 aa=n_Mult(aNumCoeff,bDenCoeff,ntRing->cf);
+  if (aDenCoeff==NULL) bb=n_Copy(bNumCoeff,ntRing->cf);
+  else                 bb=n_Mult(bNumCoeff,aDenCoeff,ntRing->cf);
+  BOOLEAN rr= n_Greater(aa, bb, ntCoeffs);
+  n_Delete(&aa,ntRing->cf);
+  n_Delete(&bb,ntRing->cf);
+  return rr;
 }
 

m4/ax_python_with_version.m4

@@ -26 +26 @@
     then
         AC_MSG_CHECKING(for --with-python)
-        AC_ARG_WITH(
+# @<:@=@<:@embed,@:>@PYTHON@:>@
+          AC_ARG_WITH(
             python,
-            AS_HELP_STRING([--with-python@<:@=@<:@embed,@:>@PYTHON@:>@],
+            AS_HELP_STRING([--with-python],
                 [absolute path name of Python executable]
             ),