Changeset dad9fb in git

Timestamp:

Mar 15, 2012, 5:26:46 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

8066cd9340c30bf555310cdb3ca4a9c82b4f3e92a82c308b8fbf35f5d32c156ead224188e2610f7e

Parents:

788fdfc919bcf38d8b469a0f59374abf9046985dd841a16156c2e0b2a5e731384a7a5e454dffe2d8

Message:

Merge pull request #82 from mmklee/bug_fixes_sw

Bug fixes sw

Files:

• Singular/LIB/resbinomial.lib (modified) (1 diff)
• Singular/LIB/sagbi.lib (modified) (1 diff)
• Singular/cntrlc.cc (modified) (3 diffs)
• Singular/iparith.cc (modified) (2 diffs)
• Singular/ipshell.cc (modified) (1 diff)
• libpolys/coeffs/gnumpc.cc (modified) (1 diff)
• libpolys/coeffs/gnumpc.h (modified) (1 diff)
• libpolys/coeffs/gnumpfl.cc (modified) (1 diff)
• libpolys/coeffs/gnumpfl.h (modified) (1 diff)
• libpolys/coeffs/shortfl.cc (modified) (1 diff)
• libpolys/coeffs/shortfl.h (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (3 diffs)
• libpolys/polys/monomials/p_polys.cc (modified) (1 diff)
• libpolys/polys/monomials/p_polys.h (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (2 diffs)
• m4/options.m4 (modified) (1 diff)

Singular/LIB/resbinomial.lib

@@ -109 +109 @@
 
 if (cont!=n or n<=2){
-
-             // defining the new variables in Lring2[2]
-
-              list Lring,Lring2;
-              Lring=ringlist(basering);
-
-              ring raux=0,(x(1..n)),dp;
-              setring r;
-              Lring2=ringlist(raux);
-
              // making the change
-
-              for (i=1;i<=n; i++){ Lring[2][i]=Lring2[2][i];}
-
-              def Rnew=ring(Lring);
+              def Rnew=changevar ("x()");
               setring Rnew;
                 // print("INVERTIBLE VARIABLES NOT CONSIDERED AT THE BEGINNING");

Singular/LIB/sagbi.lib

@@ -70 +70 @@
   //-------- extend current baserring r with new variables @y,
   // one for each new element in ideal algebra  -------------
+  setring r;
   list l = ringlist(r);
   for (i=nvars(r)-nvars(br)+1; i<=numTotalAdditionalVars;i++)

Singular/cntrlc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
 /*
 * ABSTRACT - interupt handling
@@ -223 +222 @@
 #endif /* __OPTIMIZE__ */
 #ifdef CALL_GDB
-  if (sig!=SIGINT) 
+  if (sig!=SIGINT)
   {
     if (singular_in_batchmode) debug(STACK_TRACE);
@@ -248 +247 @@
 void sig_chld_hdl(int sig)
 {
- waitpid(-1,NULL,WNOHANG);  
+  waitpid(-1,NULL,WNOHANG);
 }
 

Singular/iparith.cc

@@ -6013 +6013 @@
   }
 #endif
-  if (!(ringvar=pVar(p)))
+  if ((ringvar=pVar(p))==0)
   {
     if (rField_is_Extension(currRing))
@@ -6019 +6019 @@
       assume(currRing->cf->extRing!=NULL);
       number n = pGetCoeff(p);
-      ringvar=- n_IsParam(n, currRing);
+      ringvar= -n_IsParam(n, currRing);
     }
     if(ringvar==0)

Singular/ipshell.cc

@@ -5091 +5091 @@
        LongComplexInfo param;
 
-       param.float_len = float_len;
-       param.float_len2 = float_len2;
+       param.float_len = si_min (float_len, 32767);
+       param.float_len2 = si_min (float_len2, 32767);
 
        // set the parameter name
        if (complex_flag)
        {
+         if (param.float_len < SHORT_REAL_LENGTH)
+         {
+           param.float_len= SHORT_REAL_LENGTH;
+           param.float_len2= SHORT_REAL_LENGTH;
+         }
          if (pn->next == NULL)
            param.par_name=(const char*)"i"; //default to i

libpolys/coeffs/gnumpc.cc

@@ -432 +432 @@
   n->cfSetChar=ngcSetChar;
 
-//  r->cfInit_bigint=ngcInit_bigint;
+  n->cfInit_bigint=ngcMapQ;
 
 /*

libpolys/coeffs/gnumpc.h

@@ -52 +52 @@
 
 
-// Why is this here? who needs it?
-// number ngcMapQ(number from, const coeffs r, const coeffs aRing);
+number ngcMapQ(number from, const coeffs r, const coeffs aRing);
 #endif
 /* GMPCOMPLEX_H */

libpolys/coeffs/gnumpfl.cc

@@ -433 +433 @@
   n->cfSetMap = ngfSetMap;
   n->cfCoeffWrite = ngfCoeffWrite;
+  n->cfInit_bigint = ngfMapQ;
 #ifdef LDEBUG
   n->cfDBTest  = ndDBTest; // not yet implemented: ngfDBTest

libpolys/coeffs/gnumpfl.h

@@ -42 +42 @@
 void     ngfDelete(number *a, const coeffs r);
 
-number ngfMapQ(number from, const coeffs r);
+number ngfMapQ(number from, const coeffs src, const coeffs r);
 
 #endif

libpolys/coeffs/shortfl.cc

@@ -572 +572 @@
   n->cfSetMap = nrSetMap;
   n->cfCoeffWrite  = nrCoeffWrite;
+  n->cfInit_bigint = nrMapQ;
 
     /* nName= ndName; */

libpolys/coeffs/shortfl.h

@@ -44 +44 @@
 // Where are the following used?
 // int     nrGetChar();
-// number nrMapQ(number from, const coeffs r, const coeffs aRing);
+number nrMapQ(number from, const coeffs r, const coeffs aRing);
 
 

libpolys/polys/ext_fields/transext.cc

@@ -247 +247 @@
   if (IS0(a)) return NULL;
   fraction f = (fraction)a;
-  poly g = p_Copy(NUM(f), ntRing);
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
-  NUM(result) = g;
-  DEN(result) = NULL;
-  COM(result) = 0;
+  BOOLEAN denis1= DENIS1 (f);
+  if (getCoeffType (ntCoeffs) == n_Q && !denis1)
+    handleNestedFractionsOverQ (f, cf);
+  NUM (result)= p_Copy (NUM (f), ntRing);
+  DEN (result) = NULL;
+  COM (result) = 0;
+  if (getCoeffType (ntCoeffs) == n_Q && denis1)
+  {
+    if (!p_IsConstant (NUM (result), ntRing) && pNext (NUM(result)) != NULL)
+      p_Cleardenom (NUM(result), ntRing);
+    else
+    {
+      number g= p_GetAllDenom (NUM (result), ntRing);
+      NUM (result)= p_Mult_nn (NUM (result), g, ntRing);
+    }
+  }
   return (number)result;
 }
@@ -260 +272 @@
   definiteGcdCancellation(a, cf, FALSE);
   fraction f = (fraction)a;
-  poly g;
-  if (IS0(f) || DENIS1(f)) g = p_One(ntRing);
-  else g = p_Copy(DEN(f), ntRing);
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
-  NUM(result) = g;
-  DEN(result) = NULL;
-  COM(result) = 0;
+  number g;
+  if (IS0(f) || (DENIS1 (f) && getCoeffType (ntCoeffs) != n_Q))
+  {
+    NUM (result)= p_One(ntRing);
+    DEN (result)= NULL;
+    COM (result)= 0;
+  }
+  else if (DENIS1 (f))
+  {
+    poly num= p_Copy (NUM (f), ntRing);
+    if (!p_IsConstant (num, ntRing) && pNext(num) != NULL)
+      p_Cleardenom_n (num, ntRing, g);
+    else
+      g= p_GetAllDenom (num, ntRing);
+    result= (fraction) ntSetMap (ntRing->cf, cf) (g, ntRing->cf, cf);
+  }
+  else
+  {
+    if (getCoeffType (ntCoeffs) == n_Q)
+      handleNestedFractionsOverQ (f, cf);
+    NUM (result)= p_Copy (DEN (f), ntRing);
+    DEN (result) = NULL;
+    COM (result) = 0;
+  }
   return (number)result;
 }
@@ -1049 +1079 @@
   if (n_IsZero(a, src)) return NULL;
   assume(src == dst->extRing->cf);
-  poly p = p_One(dst->extRing);
+  poly p = p_Init(dst->extRing);
   number na=n_Copy(a, src);
   n_Normalize(na, src);
-  p_SetCoeff(p, na, dst->extRing);
+  p_SetCoeff0(p, na, dst->extRing);
   fraction f = (fraction)omAlloc0Bin(fractionObjectBin);
   NUM(f) = p; DEN(f) = NULL; COM(f) = 0;

libpolys/polys/monomials/p_polys.cc

@@ -3414 +3414 @@
        return NULL;
 
-    if( !DENIS1(z) )
-      WarnS("Not implemented yet: Cannot permute a rational fraction and make a polynomial out of it! Ignorring the denumerator.");
+    //if( !DENIS1(z) )
+      //WarnS("Not implemented yet: Cannot permute a rational fraction and make a polynomial out of it! Ignorring the denumerator.");
   } else
      {

libpolys/polys/monomials/p_polys.h

@@ -437 +437 @@
     switch(r->typ[i].ord_typ)
     {
+      case ro_am:
       case ro_wp_neg:
         return (((long)((p)->exp[r->pOrdIndex]))-POLY_NEGWEIGHT_OFFSET);

libpolys/polys/monomials/ring.cc

@@ -795 +795 @@
         r1->cf->ref++;
       }
+      else if ((getCoeffType (r2->cf)==n_algExt || getCoeffType (r2->cf)==n_transExt) && rChar(r2) == rChar(r1))
+      {
+        /*AlgExtInfo extParam;
+        extParam.r = r2->cf->extRing;
+        extParam.i = r2->cf->extRing->minideal;*/
+        tmpR.cf=r2->cf;
+        r2->cf->ref++;
+      }
       else
       {
@@ -809 +817 @@
     {
       if (getCoeffType(r2->cf)==n_Zp)
+      {
+        tmpR.cf=r2->cf;
+        r2->cf->ref++;
+      }
+      else if (getCoeffType(r2->cf)==n_algExt || getCoeffType(r2->cf)==n_transExt)
       {
         tmpR.cf=r2->cf;

m4/options.m4

@@ -61 +61 @@
 if test x$ENABLE_PLURAL = xyes; then
   AC_DEFINE(HAVE_PLURAL,1,Enable non-commutative subsystem)
+  #TODO make a seperate switch
+  AC_DEFINE(HAVE_SHIFTBBA,1,Enable letterplace)
 fi